diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 00000000..91e8dc83
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,22 @@
+{
+  "name": "mcp-development-skills",
+  "owner": {
+    "name": "Model Context Protocol",
+    "email": "admin@modelcontextprotocol.io"
+  },
+  "metadata": {
+    "description": "Production-ready skills for MCP (Model Context Protocol) development and automation",
+    "version": "1.0.0"
+  },
+  "plugins": [
+    {
+      "name": "mcp-server-generator",
+      "description": "Automatically generates compliant server.json files for MCP servers and hosted services following official registry specifications. Supports NPM, PyPI, OCI, MCPB, NuGet packages and remote/hosted MCP services with built-in validation.",
+      "source": "./",
+      "strict": false,
+      "skills": [
+        "./mcp-server-generator"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/README.md b/.claude/skills/mcp-server-generator/README.md
new file mode 100644
index 00000000..c3d43d21
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/README.md
@@ -0,0 +1,201 @@
+# MCP Server Description Generator Skill
+
+This skill helps you automatically generate compliant `server.json` files for both **installable MCP servers** (from Git repositories) and **hosted/remote MCP services** (accessible via URL endpoints).
+
+## Purpose
+
+The MCP Server Description Generator creates standards-compliant `server.json` files according to the [official MCP registry specification](https://github.com/modelcontextprotocol/registry/tree/main/docs/reference/server-json).
+
+It handles two types of MCP servers:
+1. **Installable MCP Servers** - Analyzes Git repositories and generates `packages` field
+2. **Hosted/Remote MCP Services** - Analyzes service documentation and generates `remotes` field
+
+## When to Use
+
+Use this skill when you need to:
+- Generate a `server.json` file for an MCP server repository
+- Create registry entries for hosted/remote MCP services
+- Validate that a server.json conforms to the standard
+- Extract metadata from an MCP server codebase
+- Document MCP services accessible via URL endpoints
+
+## How It Works
+
+The skill supports two workflows:
+
+### Workflow A: Installable MCP Server (Repository-Based)
+
+1. **Prompt for output location** (default: `./mcp-servers/<repo-name>.json`)
+2. **Clone the repository** (shallow clone to /tmp)
+3. **Verify it's an MCP server** (checks for MCP SDK dependencies)
+4. **Identify the package type** (NPM, Python, Docker, etc.)
+5. **Extract metadata** from package manifests (package.json, pyproject.toml, etc.)
+6. **Analyze the codebase** for:
+   - Transport type (stdio, sse, streamable-http)
+   - Environment variables
+   - Tool definitions
+   - Configuration requirements
+7. **Generate server.json with `packages` field**
+8. **Validate** the output using the validation script
+9. **Save the file** to the specified location
+10. **Clean up** temporary files
+
+### Workflow B: Hosted/Remote MCP Service
+
+1. **Prompt for output location** (default: `./mcp-servers/<service-name>.json`)
+2. **Gather service information** from:
+   - Documentation URLs (using WebFetch)
+   - PDF files (text extraction)
+   - User-provided details
+3. **Extract metadata**:
+   - Service name and description
+   - MCP endpoint URL(s)
+   - Transport type (SSE, streamable-http)
+   - Organization/vendor information
+4. **Determine reverse-DNS naming** from domain
+5. **Identify transport configuration** and headers
+6. **Generate server.json with `remotes` field**
+7. **Validate** the output using the validation script
+8. **Save the file** to the specified location
+
+## Usage Examples
+
+### Repository-Based MCP Server
+
+```
+Generate a server.json for https://github.com/modelcontextprotocol/servers/tree/main/src/brave-search
+```
+
+```
+Create a server.json for the MCP server at https://github.com/example/my-mcp-server
+and include all optional fields
+```
+
+### Hosted/Remote MCP Service
+
+```
+Generate a server.json for the CVE MCP Server documented in the ./cve/ folder
+```
+
+```
+Create a server.json for the hosted MCP service at https://api.example.com/mcp
+```
+
+```
+I have documentation PDFs for our internal MCP service. Generate a server.json from them.
+```
+
+### Analysis Only
+```
+Analyze https://github.com/example/server and tell me what would go in the server.json
+```
+
+## Output
+
+The skill generates:
+
+1. **Complete server.json** file saved to the specified location (default: `./mcp-servers/<repo-name>.json`)
+2. **Validation report** from the automated validation script
+3. **Explanatory notes** including:
+   - Assumptions made during generation
+   - Fields that may need manual verification
+   - Suggestions for improvement
+   - Missing information warnings
+   - Validation results and any errors
+
+## Validation
+
+The skill includes an automated validation script ([`validate-server-json.sh`](./validate-server-json.sh)) that:
+
+- ✓ Checks JSON syntax validity
+- ✓ Downloads and validates against the official JSON schema
+- ✓ Verifies all required fields are present
+- ✓ Validates field constraints (length, format, patterns)
+- ✓ Checks reverse-DNS naming format
+- ✓ Validates transport types
+- ✓ Reports detailed error messages
+
+### Running Validation Manually
+
+```bash
+bash .claude/skills/mcp-server-generator/validate-server-json.sh path/to/server.json
+```
+
+### Validation Requirements
+
+The validation script requires:
+- `jq` - JSON processor (install: `brew install jq`)
+- `python3` with `jsonschema` - For schema validation (install: `pip3 install jsonschema`)
+
+If Python jsonschema is not available, the script will skip schema validation but still perform basic field checks.
+
+### Validation Test Results
+
+See [validation/REPORT.md](validation/REPORT.md) for comprehensive testing results comparing skill-generated server.json files against the official MCP registry for 9 diverse server types (NPM, PyPI, OCI, remote SSE, streamable-http, MCPB, NuGet). The report shows 55.6% perfect matches and detailed analysis of differences.
+
+## Supported Package Types (Workflow A)
+
+For installable MCP servers from repositories:
+
+- **NPM** - Node.js packages
+- **PyPI** - Python packages
+- **OCI/Docker** - Container images (environment variables only, no `-e` runtime flags)
+- **MCPB** - MCP bundles
+- **NuGet** - .NET packages
+
+### Important Note for OCI Packages
+
+For OCI/container packages, the skill correctly generates:
+- ✅ `environmentVariables` section for runtime configuration
+- ❌ NO `runtimeArguments` with `-e` flags (those are container CLI specifics)
+
+The MCP client/runtime handles passing environment variables to containers appropriately.
+
+## Supported Transports
+
+### For Packages (Workflow A)
+- **stdio** - Standard input/output (default for installable packages)
+- **sse** - Server-Sent Events (with `url` field for containers)
+
+### For Remotes (Workflow B)
+- **sse** - Server-Sent Events (most common for hosted services)
+- **streamable-http** - HTTP streaming
+
+## Server.json Schema Compliance
+
+The generated files comply with the official MCP registry specification:
+- **Schema**: `https://modelcontextprotocol.io/schemas/server.schema.json`
+- **Spec Version**: Draft (pre-1.0) - Last verified: 2025-10-24
+- **Required fields**: `$schema`, `name`, `description`, `version`
+- **Reverse-DNS naming**: `domain.tld/server-name`
+- **Validation**: All fields validated against schema constraints
+
+**Schema Version Tracking**: See [VERSION_TRACKING.md](VERSION_TRACKING.md) for schema version information and update procedures.
+
+## Notes
+
+- The skill makes intelligent assumptions when information is incomplete
+- Environment variables are only included if clearly documented
+- Repository metadata is automatically populated
+- Version numbers are extracted from package manifests
+- Cleanup of temporary directories is automatic
+
+## Related Documentation
+
+- [MCP Registry Specification](https://github.com/modelcontextprotocol/registry/tree/main/docs/reference/server-json)
+- [MCP Server.json Schema](https://modelcontextprotocol.io/schemas/server.schema.json)
+- [Generic Server JSON Format](https://github.com/modelcontextprotocol/registry/blob/main/docs/reference/server-json/generic-server-json.md)
+- [Version Tracking](VERSION_TRACKING.md) - Schema version tracking and update procedures
+- [Validation Report](validation/REPORT.md) - Comprehensive testing results and accuracy analysis
+
+## Maintaining the Skill
+
+When the MCP registry schema is updated:
+
+1. Check [VERSION_TRACKING.md](VERSION_TRACKING.md) for the update checklist
+2. Update schema URLs and examples in [SKILL.md](SKILL.md)
+3. Update the validation script with new schema URL
+4. Test with existing server.json files to ensure compatibility
+5. Document changes in VERSION_TRACKING.md
+
+The skill is designed to be easily updated as the MCP specification evolves.
diff --git a/.claude/skills/mcp-server-generator/SKILL.md b/.claude/skills/mcp-server-generator/SKILL.md
new file mode 100644
index 00000000..5cf15e1b
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/SKILL.md
@@ -0,0 +1,757 @@
+---
+name: mcp-server-generator
+description: Generates compliant server.json descriptions following the official MCP registry specification for both installable MCP servers (from Git repositories) and hosted/remote MCP services. Use this when the user asks to generate, create, or analyze server.json files for MCP servers.
+---
+
+# MCP Server Description Generator
+
+You are an expert at analyzing MCP servers and generating compliant server.json descriptions according to the official MCP registry specification. You can handle both:
+
+1. **Installable MCP Servers** - From Git repositories (generates `packages` field)
+2. **Hosted/Remote MCP Services** - Accessible via URL endpoints (generates `remotes` field)
+
+## Schema Version Configuration
+
+**IMPORTANT**: This skill generates server.json files based on the MCP Registry specification. When the specification is updated, update these references:
+
+### Current Schema Version
+- **Schema URL**: `https://modelcontextprotocol.io/schemas/server.schema.json`
+- **Reference Schema** (GitHub): `https://raw.githubusercontent.com/modelcontextprotocol/registry/main/docs/reference/server-json/server.schema.json`
+- **Documentation**: https://github.com/modelcontextprotocol/registry/tree/main/docs/reference/server-json
+- **Last Verified**: 2025-10-24
+- **Spec Version**: Draft (pre-1.0)
+
+### How to Update When Schema Changes
+
+1. **Check for schema updates** at https://github.com/modelcontextprotocol/registry
+2. **Update the schema URL** in the `$schema` field examples below
+3. **Update the validation script** (`.claude/skills/mcp-server-generator/scripts/validate-server-json.sh`) with the new schema URL
+4. **Review new/changed fields** in the documentation and update examples accordingly
+5. **Update the "Last Verified" date** in this section
+
+---
+
+## Your Task
+
+You will generate a compliant server.json file for one of two types of MCP servers:
+
+### Type 1: Installable MCP Server (from Git repository)
+
+Given a GitHub repository URL, you will:
+
+1. **Clone and analyze the repository** to extract relevant information
+2. **Verify it's an MCP server** (has MCP SDK dependencies)
+3. **Identify package type** (npm, pypi, oci, etc.)
+4. **Generate server.json with `packages` field**
+5. **Validate the output** against the schema requirements
+
+### Type 2: Hosted/Remote MCP Service (accessible via URL)
+
+Given information about a hosted MCP service (documentation, API endpoints, etc.), you will:
+
+1. **Gather service metadata** (description, endpoints, transport type)
+2. **Identify transport configuration** (SSE, streamable-http)
+3. **Generate server.json with `remotes` field**
+4. **Validate the output** against the schema requirements
+
+## MCP Registry Standard (server.json format)
+
+### Required Fields
+
+```json
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "reverse-dns-format/server-name",
+  "description": "Brief description (1-100 chars)",
+  "version": "1.0.0"
+}
+```
+
+- **$schema**: Must point to the official JSON schema
+- **name**: Reverse-DNS format with exactly one slash (e.g., "io.modelcontextprotocol.anonymous/brave-search")
+  - Pattern: `^[a-zA-Z0-9.-]+/[a-zA-Z0-9._-]+$`
+  - Length: 3-200 characters
+- **description**: Server functionality explanation (1-100 chars)
+- **version**: Semantic version string (max 255 chars)
+
+### Optional Fields
+
+- **title**: Display name (1-100 chars)
+- **websiteUrl**: Homepage/documentation URL
+- **icons**: Array of icon objects for UI display
+- **packages**: Array of package configurations (npm, pypi, oci, nuget, mcpb)
+- **remotes**: Array of remote transport configurations
+- **repository**: Source code repository metadata
+- **_meta**: Extension metadata with reverse DNS namespacing
+
+### Package Types
+
+#### NPM Package
+```json
+{
+  "registryType": "npm",
+  "registryBaseUrl": "https://registry.npmjs.org",
+  "identifier": "@scope/package-name",
+  "version": "1.0.2",
+  "runtimeHint": "npx",
+  "transport": { "type": "stdio" },
+  "packageArguments": [],
+  "environmentVariables": []
+}
+```
+
+#### Python Package (PyPI)
+```json
+{
+  "registryType": "pypi",
+  "registryBaseUrl": "https://pypi.org",
+  "identifier": "package-name",
+  "version": "0.5.0",
+  "runtimeHint": "uvx",
+  "transport": { "type": "stdio" }
+}
+```
+
+#### OCI/Docker Container (stdio transport)
+```json
+{
+  "registryType": "oci",
+  "identifier": "docker.io/org/image:tag",
+  "transport": { "type": "stdio" },
+  "environmentVariables": [
+    {
+      "name": "API_KEY",
+      "description": "API key for the service",
+      "isRequired": true,
+      "isSecret": true,
+      "format": "string"
+    }
+  ]
+}
+```
+
+#### OCI/Docker Container (SSE transport with custom command)
+```json
+{
+  "registryType": "oci",
+  "identifier": "docker.io/org/image:tag",
+  "transport": {
+    "type": "sse",
+    "url": "http://localhost:8000/sse"
+  },
+  "packageArguments": [
+    {
+      "type": "positional",
+      "value": "fastmcp"
+    },
+    {
+      "type": "positional",
+      "value": "run"
+    },
+    {
+      "type": "named",
+      "name": "--transport",
+      "value": "sse"
+    },
+    {
+      "type": "named",
+      "name": "--host",
+      "value": "0.0.0.0"
+    },
+    {
+      "type": "named",
+      "name": "--port",
+      "value": "9001"
+    },
+    {
+      "type": "positional",
+      "value": "module/server.py"
+    }
+  ],
+  "environmentVariables": [
+    {
+      "name": "API_KEY",
+      "description": "API key for the service",
+      "isRequired": true,
+      "isSecret": true,
+      "format": "string"
+    }
+  ]
+}
+```
+
+**Important Notes for OCI Packages**:
+- Use `environmentVariables` to declare environment variables that the container needs
+- Do NOT use `runtimeArguments` with `-e` flags - those are container CLI specifics, not part of the MCP spec
+- The MCP client/runtime will handle passing environment variables to the container appropriately
+- Use `packageArguments` for arguments passed to the **application inside the container** (e.g., `fastmcp run --transport sse`)
+- Do NOT use `packageArguments` for container runtime flags (e.g., `-i`, `--rm`, `-p`)
+- **Multiple packages**: You can define the same OCI image multiple times with different transports and packageArguments to support different deployment scenarios
+
+#### MCP Bundle (MCPB)
+```json
+{
+  "registryType": "mcpb",
+  "identifier": "https://github.com/org/repo/releases/download/v1.0.0/file.mcpb",
+  "fileSha256": "sha256-hash-here"
+}
+```
+
+### Remote/Hosted MCP Services
+
+For MCP servers that are **hosted and accessible via URL** (not installable packages), use the `remotes` field instead of `packages`.
+
+**When to use `remotes`:**
+- The MCP server is a hosted service (SaaS, internal deployment, cloud service)
+- Users connect to it via URL, not by installing/running locally
+- Examples: Enterprise MCP services, API-based MCP servers, managed MCP instances
+
+**`remotes` field structure:**
+
+The `remotes` field is an **array of transport objects** (not packages). Each transport object specifies how to connect to the remote MCP service.
+
+#### Example: SSE Remote Service
+```json
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "com.example/api-service",
+  "description": "Enterprise API service accessible via MCP",
+  "version": "1.0.0",
+  "title": "Example API Service",
+  "websiteUrl": "https://api.example.com",
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://api.example.com/mcp"
+    }
+  ]
+}
+```
+
+#### Example: Multiple Remote Endpoints (Production and Staging)
+```json
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "com.company/internal-service",
+  "description": "Internal company MCP service with multiple environments",
+  "version": "2.1.0",
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://mcp-prod.company.com/mcp"
+    },
+    {
+      "type": "sse",
+      "url": "https://mcp-staging.company.com/mcp"
+    }
+  ]
+}
+```
+
+#### Example: Remote with Custom Headers
+```json
+{
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://secure-api.example.com/mcp",
+      "headers": [
+        {
+          "name": "X-API-Version",
+          "description": "API version header",
+          "isRequired": true,
+          "default": "v1"
+        }
+      ]
+    }
+  ]
+}
+```
+
+**Important Notes for Remotes**:
+- The `remotes` array contains **transport objects directly**, NOT package objects
+- Each remote must have a `type` field ("sse" or "streamable-http")
+- For SSE transport, the `url` field is **required**
+- You **cannot** have both `packages` and `remotes` in the same server.json (use one or the other)
+- Optional `headers` array can specify custom HTTP headers needed to connect
+
+### Transport Types
+
+- **stdio**: Standard input/output (most common)
+  ```json
+  { "type": "stdio" }
+  ```
+
+- **streamable-http**: HTTP streaming
+  ```json
+  {
+    "type": "streamable-http",
+    "url": "http://example.com/{variable}",
+    "headers": []
+  }
+  ```
+
+- **sse**: Server-Sent Events (requires `url` field)
+  ```json
+  {
+    "type": "sse",
+    "url": "https://example.com/sse",
+    "headers": []
+  }
+  ```
+
+  **Note**: For SSE transport, the `url` field is **required** and should point to the SSE endpoint where the server will be accessible.
+
+### Arguments
+
+#### Positional Arguments
+```json
+{
+  "type": "positional",
+  "value": "mcp",
+  "description": "Start in MCP mode"
+}
+```
+
+#### Named Arguments
+```json
+{
+  "type": "named",
+  "name": "--host",
+  "description": "Database host",
+  "default": "localhost",
+  "isRequired": true,
+  "isRepeated": false,
+  "choices": ["option1", "option2"]
+}
+```
+
+### Environment Variables
+
+Environment variables are used across all package types (NPM, PyPI, OCI, etc.) to configure the MCP server at runtime.
+
+```json
+{
+  "name": "API_KEY",
+  "description": "API key for authentication",
+  "isRequired": true,
+  "isSecret": true,
+  "format": "string",
+  "default": "default-value",
+  "choices": []
+}
+```
+
+**Key Guidelines**:
+- For **OCI/container packages**: Use ONLY `environmentVariables`, NOT `runtimeArguments` with `-e` flags
+- For **all package types**: Environment variables are passed to the application, not to the package manager/runtime
+- Mark sensitive data with `isSecret: true` (API keys, tokens, passwords)
+- Use `isRequired: true` for mandatory configuration
+- The `format` field can be: "string", "number", "boolean", or "filepath"
+
+### Repository Metadata
+```json
+{
+  "repository": {
+    "url": "https://github.com/org/repo",
+    "source": "github",
+    "subfolder": "src/server",
+    "id": "stable-identifier"
+  }
+}
+```
+
+### Icons
+```json
+{
+  "icons": [
+    {
+      "src": "https://example.com/icon.png",
+      "mimeType": "image/png",
+      "sizes": ["512x512"],
+      "theme": "light"
+    }
+  ]
+}
+```
+
+## Workflows
+
+Choose the appropriate workflow based on the type of MCP server:
+
+---
+
+## Workflow A: Installable MCP Server (Repository-Based)
+
+When given a **repository URL**, follow these steps:
+
+### 1. Clone and Explore the Repository
+```bash
+# Clone the repository to a temporary location
+git clone --depth 1 <repo_url> /tmp/mcp-server-analysis-<timestamp>
+cd /tmp/mcp-server-analysis-<timestamp>
+
+# Look for key files
+ls -la
+```
+
+### 2. **CRITICAL: Verify This is an MCP Server**
+
+Before proceeding, **verify that this repository actually implements an MCP server**:
+
+#### Check for MCP Server Indicators:
+
+**Python MCP Servers**:
+```bash
+# Check for MCP SDK dependencies
+grep -E "fastmcp|@modelcontextprotocol|mcp" pyproject.toml requirements.txt setup.py 2>/dev/null
+# Look for MCP tool/resource decorators
+grep -rE "@mcp\.tool|@server\.list_tools|@server\.list_resources" --include="*.py" .
+```
+
+**Node.js MCP Servers**:
+```bash
+# Check for MCP SDK
+jq '.dependencies | keys[] | select(contains("modelcontextprotocol"))' package.json
+# Look for MCP SDK imports
+grep -rE "from.*@modelcontextprotocol|import.*@modelcontextprotocol" --include="*.ts" --include="*.js" .
+```
+
+**Go MCP Servers**:
+```bash
+# Check for MCP packages
+grep -E "github.com/.*mcp|modelcontextprotocol" go.mod
+```
+
+#### ⚠️ **If NO MCP Indicators Found**:
+
+**STOP and inform the user**:
+```
+⚠️ WARNING: This repository does not appear to be an MCP server.
+
+I could not find:
+- MCP SDK dependencies (fastmcp, @modelcontextprotocol/sdk, mcp package)
+- MCP tool/resource/prompt definitions
+- MCP transport implementations
+
+This appears to be:
+- [Describe what it actually is: REST API, CLI tool, library, etc.]
+
+MCP servers are applications that implement the Model Context Protocol to provide:
+- Tools (functions that can be called)
+- Resources (data that can be accessed)
+- Prompts (templates for interactions)
+
+Would you like me to:
+1. Provide guidance on creating an MCP server from this project?
+2. Analyze a different repository?
+3. Exit without generating server.json?
+```
+
+**Only proceed if clear MCP server indicators are found.**
+
+### 3. Identify Package Type
+Check for:
+- `package.json` → NPM package
+- `pyproject.toml` or `setup.py` → Python package
+- `Dockerfile` or container registry → OCI/Docker
+- `.mcpb` bundle files → MCPB
+- `.csproj` or `*.sln` → NuGet package
+
+### 3. Extract Metadata
+
+From `package.json` (NPM):
+```bash
+cat package.json | jq '{name, version, description}'
+```
+
+From `pyproject.toml` (Python):
+```bash
+cat pyproject.toml | grep -E "^name|^version|^description"
+```
+
+From `README.md`:
+- Extract description
+- Find documentation URL
+- Identify tools/capabilities
+
+### 4. Determine Transport Type
+Look for:
+- Server implementation code mentioning "stdio", "sse", or "http"
+- Configuration files
+- Documentation about how to run the server
+
+### 5. Find Environment Variables
+Search for:
+```bash
+grep -r "process.env" . --include="*.js" --include="*.ts"
+grep -r "os.getenv\|os.environ" . --include="*.py"
+```
+
+### 6. Identify Tools/Resources/Prompts
+Look for MCP server implementation:
+- Tool definitions (search for `@server.list_tools`, `tools:`, etc.)
+- Resource handlers
+- Prompt templates
+
+### 7. Generate the server.json
+
+Create a complete, valid server.json with:
+- All required fields filled
+- Appropriate package configuration
+- Transport configuration
+- Environment variables if found
+- Repository metadata
+- Reasonable defaults for optional fields
+
+---
+
+## Workflow B: Hosted/Remote MCP Service
+
+When given information about a **hosted MCP service** (documentation, URLs, PDFs, etc.), follow these steps:
+
+### 1. Gather Service Information
+
+Extract or request the following information:
+- **Service name and description** - What does this MCP service do?
+- **MCP endpoint URL(s)** - Where is the service accessible?
+- **Transport type** - SSE or streamable-http?
+- **Version** - Service version if available
+- **Organization/vendor** - Who provides this service?
+- **Documentation URL** - Website or docs link
+- **Authentication requirements** - Does it need headers, tokens, etc.?
+
+### 2. Identify Available Sources
+
+Check what information sources are available:
+- Documentation URLs (try WebFetch to extract details)
+- PDF files (extract text to find URLs and configuration)
+- Internal documentation pages
+- API specifications
+- User-provided details
+
+**Example sources:**
+```bash
+# If PDFs are provided, extract text
+strings document.pdf | grep -E "https://|http://"
+
+# If documentation URL is provided, fetch it
+# Use WebFetch tool to extract service details
+```
+
+### 3. Determine Reverse-DNS Name
+
+For the `name` field, use the organization's domain in reverse-DNS format:
+- Service from `api.example.com` → `com.example/service-name`
+- Red Hat service → `com.redhat/service-name`
+- Internal service at `mcp.company.internal` → `internal.company/service-name`
+
+### 4. Identify Transport Configuration
+
+Based on the endpoint URL and documentation, determine:
+- **SSE endpoint**: Usually ends with `/sse` or `/mcp` and uses Server-Sent Events
+  ```json
+  {
+    "type": "sse",
+    "url": "https://api.example.com/mcp"
+  }
+  ```
+
+- **Streamable HTTP**: HTTP-based streaming endpoint
+  ```json
+  {
+    "type": "streamable-http",
+    "url": "https://api.example.com/mcp/{variable}"
+  }
+  ```
+
+- **Headers required**: If authentication or custom headers are needed
+  ```json
+  {
+    "type": "sse",
+    "url": "https://secure.example.com/mcp",
+    "headers": [
+      {
+        "name": "Authorization",
+        "description": "Bearer token for authentication",
+        "isRequired": true
+      }
+    ]
+  }
+  ```
+
+### 5. Handle Multiple Environments
+
+If the service has multiple environments (production, staging, QA), you can include multiple remotes:
+```json
+{
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://mcp-prod.example.com/mcp"
+    },
+    {
+      "type": "sse",
+      "url": "https://mcp-staging.example.com/mcp"
+    }
+  ]
+}
+```
+
+**Note**: Consider if multiple environments are appropriate for the registry. Often, only production endpoints should be included unless the service specifically supports multiple environments for end users.
+
+### 6. Generate the server.json
+
+Create a complete server.json with **`remotes` field** (NOT `packages`):
+
+```json
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "com.vendor/service-name",
+  "description": "Brief description of what this MCP service provides",
+  "version": "1.0.0",
+  "title": "Human-Readable Service Name",
+  "websiteUrl": "https://service-docs.example.com",
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://api.example.com/mcp"
+    }
+  ],
+  "vendor": {
+    "name": "Vendor Name Inc.",
+    "url": "https://www.vendor.com"
+  }
+}
+```
+
+### 7. Add Repository Metadata (Optional)
+
+If the remote service has open-source client code or SDK:
+```json
+{
+  "repository": {
+    "url": "https://github.com/org/mcp-client",
+    "source": "github"
+  }
+}
+```
+
+**Important**: For hosted services, the repository field is **optional** and should only be included if:
+- There's a public repository with client code, SDKs, or tools
+- There's source code for the service itself (if open-source)
+
+---
+
+## Output Format
+
+Provide the generated server.json as a complete, valid JSON file that can be:
+1. Saved directly to `server.json`
+2. Used for registry submission
+3. Validated against the official schema
+
+Include comments (as a separate explanation) about:
+- Any assumptions made
+- Missing information that should be manually verified
+- Suggestions for improvement
+- Fields that may need customization
+
+## Output File Management
+
+### Determine Output Path
+
+**IMPORTANT**: Before generating the server.json file, you MUST determine the output path:
+
+1. **Check if user provided a path**: Look for explicit file path in the user's request
+2. **If not provided, ask the user**:
+   - Extract the repository name from the URL (e.g., "brave-search" from "github.com/org/brave-search")
+   - Propose: `./mcp-servers/<repo-name>.json`
+   - Example: "I'll save the server.json to `./mcp-servers/brave-search.json`. Is this okay, or would you like a different location?"
+   - Wait for user confirmation or alternative path
+
+3. **Create directory if needed**:
+   ```bash
+   mkdir -p $(dirname <output-path>)
+   ```
+
+### Save the Generated File
+
+After generating and validating the server.json:
+```bash
+# Write the file
+cat > <output-path> << 'EOF'
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  ...
+}
+EOF
+```
+
+## Example Workflow
+
+When the user provides a repository URL, you should:
+
+1. **Determine output path** (ask if not provided, default: `./mcp-servers/<repo-name>.json`)
+2. Clone the repository to a temporary directory
+3. **⚠️ VERIFY it's an MCP server** (check for MCP SDK, tool decorators, etc.)
+   - If NOT an MCP server: Stop and inform user with options
+   - If IS an MCP server: Proceed to step 4
+4. Analyze all relevant files (package.json, pyproject.toml, README.md, source code)
+5. Extract metadata and configuration
+6. Generate a compliant server.json file
+7. **Validate the generated file** using the validation script
+8. **Save to the determined path**
+9. Provide the JSON output with explanatory notes and validation results
+
+## Validation
+
+### Automatic Validation Script
+
+After generating the server.json file, **ALWAYS run the validation script**:
+
+```bash
+# Run the validation script
+bash .claude/skills/mcp-server-generator/scripts/validate-server-json.sh <output-path>
+```
+
+The validation script will:
+1. Check that the file is valid JSON
+2. Validate against the official JSON schema
+3. Verify all required fields are present
+4. Check field constraints (length, format, patterns)
+5. Report any errors or warnings
+
+### Manual Validation Checks
+
+Before running the validation script, verify:
+- Required fields are present and valid
+- Name follows reverse-DNS pattern with exactly one slash
+- Description is 1-100 characters
+- Version is a valid semantic version
+- Package configuration matches the detected type
+- Transport type is valid (stdio, streamable-http, or sse)
+- All URLs are valid and use HTTPS where appropriate
+- Environment variables have proper format and required/secret flags
+
+**Special Checks for OCI Packages**:
+- ✅ Environment variables are defined in `environmentVariables` section
+- ❌ NO `-e` flags in `runtimeArguments` (container runtime specifics don't belong in MCP spec)
+- ❌ NO duplicate environment variable definitions
+- The MCP client will handle passing environment variables to the container
+
+### Handling Validation Errors
+
+If validation fails:
+1. Review the error messages from the validation script
+2. Fix the issues in the generated JSON
+3. Re-run the validation
+4. Only save the file once validation passes
+
+## Notes
+
+- If information is missing or unclear, make reasonable assumptions and document them
+- Prefer stdio transport unless the repository clearly indicates otherwise
+- Include environment variables only if they are clearly documented or used in the code
+- Use the repository's existing version number or default to "1.0.0"
+- For the reverse-DNS name, use "io.modelcontextprotocol.anonymous/{repo-name}" if no organization domain is available
+- Clean up the temporary clone directory after analysis
diff --git a/.claude/skills/mcp-server-generator/VERSION_TRACKING.md b/.claude/skills/mcp-server-generator/VERSION_TRACKING.md
new file mode 100644
index 00000000..edd37987
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/VERSION_TRACKING.md
@@ -0,0 +1,110 @@
+# MCP Registry Schema Version Tracking
+
+This document tracks the MCP Registry specification version used by the MCP Server Description Generator skill.
+
+## Current Schema Version
+
+| Property | Value |
+|----------|-------|
+| **Schema URL** | `https://modelcontextprotocol.io/schemas/server.schema.json` |
+| **Reference Schema (GitHub)** | `https://raw.githubusercontent.com/modelcontextprotocol/registry/main/docs/reference/server-json/server.schema.json` |
+| **Documentation** | https://github.com/modelcontextprotocol/registry/tree/main/docs/reference/server-json |
+| **Spec Version** | Draft (pre-1.0) |
+| **Last Verified** | 2025-10-24 |
+| **Last Updated** | 2025-10-24 |
+
+## Schema Change History
+
+| Date | Version | Changes | Updated By |
+|------|---------|---------|------------|
+| 2025-10-24 | Draft (Initial) | Initial skill creation with schema validation | Claude Code |
+
+## Update Checklist
+
+When the MCP Registry schema is updated, follow these steps:
+
+### 1. Check for Updates
+- [ ] Visit https://github.com/modelcontextprotocol/registry
+- [ ] Check for new releases or schema changes
+- [ ] Review CHANGELOG.md in the registry repository
+- [ ] Check for schema version announcements
+
+### 2. Update Files
+
+- [ ] **SKILL.md**
+  - [ ] Update "Schema Version Configuration" section
+  - [ ] Update `$schema` URL in all JSON examples
+  - [ ] Update "Last Verified" date
+  - [ ] Update "Spec Version" if applicable
+  - [ ] Review and update field examples for any new/changed fields
+
+- [ ] **validate-server-json.sh**
+  - [ ] Update `SCHEMA_URL` variable
+  - [ ] Update "Last Verified" date in header comments
+  - [ ] Update "Spec Version" in header comments
+  - [ ] Review validation logic for any schema changes
+
+- [ ] **VERSION_TRACKING.md** (this file)
+  - [ ] Update "Current Schema Version" table
+  - [ ] Add entry to "Schema Change History"
+  - [ ] Document any breaking changes
+
+- [ ] **README.md**
+  - [ ] Update schema version references if mentioned
+  - [ ] Update examples if schema changed
+
+### 3. Test Changes
+
+- [ ] Regenerate an existing server.json to verify compatibility
+- [ ] Run validation script on test files
+- [ ] Verify all required fields are still correct
+- [ ] Check that new optional fields are documented
+
+### 4. Document Changes
+
+- [ ] Update this file with change summary
+- [ ] Note any breaking changes
+- [ ] Update examples to use new fields if applicable
+
+## Key Files to Update
+
+| File | Location | What to Update |
+|------|----------|----------------|
+| **SKILL.md** | `.claude/skills/mcp-server-generator/SKILL.md` | Schema URLs, examples, field definitions |
+| **validate-server-json.sh** | `.claude/skills/mcp-server-generator/scripts/validate-server-json.sh` | Schema URL, validation logic |
+| **VERSION_TRACKING.md** | `.claude/skills/mcp-server-generator/VERSION_TRACKING.md` | Version table, change history |
+| **README.md** | `.claude/skills/mcp-server-generator/README.md` | Schema references in docs |
+
+## Monitoring for Updates
+
+### Official Sources
+- **Registry Repository**: https://github.com/modelcontextprotocol/registry
+  - Watch for new releases
+  - Monitor `docs/reference/server-json/` directory
+  - Check CHANGELOG.md
+
+- **MCP Specification**: https://spec.modelcontextprotocol.io/
+  - Check for registry specification updates
+  - Review roadmap for upcoming changes
+
+- **Community Channels**:
+  - MCP Discord: Announcements about spec changes
+  - GitHub Discussions: Schema-related discussions
+
+## Breaking Changes
+
+Document any breaking changes here when updating:
+
+### [Version] - [Date]
+- **Breaking Change**: Description of what changed
+- **Migration**: How to update existing server.json files
+- **Impact**: Which fields/features are affected
+
+---
+
+## Notes
+
+- The schema is currently in **draft** status (pre-1.0)
+- Expect potential breaking changes until v1.0 is released
+- Always validate generated files after schema updates
+- Keep this document updated with every schema version change
diff --git a/.claude/skills/mcp-server-generator/examples/cve-mcp.json b/.claude/skills/mcp-server-generator/examples/cve-mcp.json
new file mode 100644
index 00000000..042930f4
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/examples/cve-mcp.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "com.redhat/cve-mcp",
+  "description": "Query CVE information and security advisories from Red Hat's vulnerability database",
+  "version": "1.0.0",
+  "title": "Red Hat CVE MCP Server",
+  "websiteUrl": "https://cve-mcp-production.apps.ext-waf.spoke.prod.us-east-1.aws.paas.redhat.com/",
+  "remotes": [
+    {
+      "type": "sse",
+      "url": "https://cve-mcp-production.apps.ext-waf.spoke.prod.us-east-1.aws.paas.redhat.com/mcp"
+    }
+  ],
+  "vendor": {
+    "name": "Red Hat Inc.",
+    "url": "https://www.redhat.com"
+  }
+}
diff --git a/.claude/skills/mcp-server-generator/examples/spotdb.json b/.claude/skills/mcp-server-generator/examples/spotdb.json
new file mode 100644
index 00000000..7e7483a4
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/examples/spotdb.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.aliengiraffe/spotdb",
+  "description": "Ephemeral data sandbox for AI workflows with guardrails and security",
+  "repository": {
+    "url": "https://github.com/aliengiraffe/spotdb",
+    "source": "github"
+  },
+  "version": "v1.3.0",
+  "packages": [
+    {
+      "registryType": "oci",
+      "registryBaseUrl": "https://docker.io",
+      "identifier": "aliengiraffe/spotdb",
+      "version": "v1.3.0",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Optional API key for request authentication",
+          "isRequired": false,
+          "format": "string",
+          "isSecret": true,
+          "name": "X-API-Key"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/examples/testing-farm-mcp.json b/.claude/skills/mcp-server-generator/examples/testing-farm-mcp.json
new file mode 100644
index 00000000..5b5db595
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/examples/testing-farm-mcp.json
@@ -0,0 +1,116 @@
+{
+  "$schema": "https://modelcontextprotocol.io/schemas/server.schema.json",
+  "name": "com.redhat.testing-farm/testing-farm-mcp",
+  "description": "MCP server for Testing Farm Service - submit tests and list composes",
+  "version": "0.1.0",
+  "title": "Testing Farm MCP Server",
+  "websiteUrl": "https://github.com/thrix/testing-farm-mcp",
+  "repository": {
+    "url": "https://github.com/thrix/testing-farm-mcp",
+    "source": "github"
+  },
+  "packages": [
+    {
+      "registryType": "pypi",
+      "registryBaseUrl": "https://pypi.org",
+      "identifier": "testing-farm-mcp",
+      "version": "0.1.0",
+      "runtimeHint": "uvx",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "name": "TESTING_FARM_API_TOKEN",
+          "description": "Testing Farm API token for authentication",
+          "isRequired": true,
+          "isSecret": true,
+          "format": "string"
+        },
+        {
+          "name": "TESTING_FARM_API_URL",
+          "description": "Testing Farm API URL (optional, defaults to public API)",
+          "isRequired": false,
+          "isSecret": false,
+          "format": "string"
+        }
+      ]
+    },
+    {
+      "registryType": "oci",
+      "identifier": "ghcr.io/thrix/testing-farm-mcp:latest",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "name": "TESTING_FARM_API_TOKEN",
+          "description": "Testing Farm API token for authentication",
+          "isRequired": true,
+          "isSecret": true,
+          "format": "string"
+        },
+        {
+          "name": "TESTING_FARM_API_URL",
+          "description": "Testing Farm API URL (optional, defaults to public API)",
+          "isRequired": false,
+          "isSecret": false,
+          "format": "string"
+        }
+      ]
+    },
+    {
+      "registryType": "oci",
+      "identifier": "ghcr.io/thrix/testing-farm-mcp:latest",
+      "transport": {
+        "type": "sse",
+        "url": "http://localhost:9001/sse"
+      },
+      "packageArguments": [
+        {
+          "type": "positional",
+          "value": "fastmcp"
+        },
+        {
+          "type": "positional",
+          "value": "run"
+        },
+        {
+          "type": "named",
+          "name": "--transport",
+          "value": "sse"
+        },
+        {
+          "type": "named",
+          "name": "--host",
+          "value": "0.0.0.0"
+        },
+        {
+          "type": "named",
+          "name": "--port",
+          "value": "9001"
+        },
+        {
+          "type": "positional",
+          "value": "testing_farm_mcp/server.py"
+        }
+      ],
+      "environmentVariables": [
+        {
+          "name": "TESTING_FARM_API_TOKEN",
+          "description": "Testing Farm API token for authentication",
+          "isRequired": true,
+          "isSecret": true,
+          "format": "string"
+        },
+        {
+          "name": "TESTING_FARM_API_URL",
+          "description": "Testing Farm API URL (optional, defaults to public API)",
+          "isRequired": false,
+          "isSecret": false,
+          "format": "string"
+        }
+      ]
+    }
+  ]
+}
diff --git a/.claude/skills/mcp-server-generator/validate-server-json.sh b/.claude/skills/mcp-server-generator/validate-server-json.sh
new file mode 100755
index 00000000..62b98aeb
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validate-server-json.sh
@@ -0,0 +1,269 @@
+#!/bin/bash
+# Validate server.json files against the MCP registry schema
+# Usage: ./validate-server-json.sh <path-to-server.json>
+#
+# MCP REGISTRY SCHEMA VERSION CONFIGURATION
+# ==========================================
+# This script validates against the official MCP registry specification.
+# When the schema is updated, update these URLs:
+#
+# Current Schema Version:
+#   - Official URL: https://modelcontextprotocol.io/schemas/server.schema.json
+#   - Reference URL: https://raw.githubusercontent.com/modelcontextprotocol/registry/main/docs/reference/server-json/server.schema.json
+#   - Documentation: https://github.com/modelcontextprotocol/registry/tree/main/docs/reference/server-json
+#   - Last Verified: 2025-10-24
+#   - Spec Version: Draft (pre-1.0)
+#
+# Update Instructions:
+#   1. Check for updates at: https://github.com/modelcontextprotocol/registry
+#   2. Update SCHEMA_URL below if the schema location changes
+#   3. Update the "Last Verified" date in the comments
+#   4. Update the SKILL.md file with corresponding schema version changes
+#
+# ==========================================
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Schema URL - use the GitHub raw URL as the official one may not be available yet
+# UPDATE THIS when the schema version changes
+SCHEMA_URL="https://raw.githubusercontent.com/modelcontextprotocol/registry/main/docs/reference/server-json/server.schema.json"
+SCHEMA_FILE="/tmp/mcp-server.schema.json"
+
+# Function to print colored output
+print_error() {
+    echo -e "${RED}✗ ERROR:${NC} $1" >&2
+}
+
+print_success() {
+    echo -e "${GREEN}✓ SUCCESS:${NC} $1"
+}
+
+print_warning() {
+    echo -e "${YELLOW}⚠ WARNING:${NC} $1"
+}
+
+print_info() {
+    echo -e "${BLUE}ℹ INFO:${NC} $1"
+}
+
+# Check if file argument provided
+if [ $# -eq 0 ]; then
+    print_error "No file specified"
+    echo "Usage: $0 <path-to-server.json>"
+    exit 1
+fi
+
+SERVER_JSON_FILE="$1"
+
+# Check if file exists
+if [ ! -f "$SERVER_JSON_FILE" ]; then
+    print_error "File not found: $SERVER_JSON_FILE"
+    exit 1
+fi
+
+print_info "Validating: $SERVER_JSON_FILE"
+echo ""
+
+# Step 1: Check if file is valid JSON
+print_info "Step 1/6: Checking if file is valid JSON..."
+if ! jq empty "$SERVER_JSON_FILE" 2>/dev/null; then
+    print_error "Invalid JSON syntax"
+    exit 1
+fi
+print_success "Valid JSON syntax"
+echo ""
+
+# Step 2: Download schema if not cached
+print_info "Step 2/6: Fetching JSON schema..."
+if [ ! -f "$SCHEMA_FILE" ] || [ $(find "$SCHEMA_FILE" -mmin +60 2>/dev/null | wc -l) -gt 0 ]; then
+    if curl -sSL "$SCHEMA_URL" -o "$SCHEMA_FILE" 2>/dev/null; then
+        print_success "Schema downloaded"
+    else
+        print_warning "Could not download schema, using basic validation only"
+        SCHEMA_FILE=""
+    fi
+else
+    print_success "Using cached schema"
+fi
+echo ""
+
+# Step 3: Validate against JSON schema using ajv-cli or Python
+print_info "Step 3/6: Validating against JSON schema..."
+SCHEMA_VALID=false
+
+# Try using Python jsonschema (most reliable)
+if command -v python3 &> /dev/null && [ -n "$SCHEMA_FILE" ]; then
+    VALIDATION_SCRIPT=$(cat <<'PYTHON'
+import json
+import sys
+from jsonschema import validate, ValidationError, Draft7Validator
+from jsonschema.exceptions import SchemaError
+
+try:
+    with open(sys.argv[1], 'r') as f:
+        schema = json.load(f)
+    with open(sys.argv[2], 'r') as f:
+        instance = json.load(f)
+
+    validator = Draft7Validator(schema)
+    errors = list(validator.iter_errors(instance))
+
+    if errors:
+        print("VALIDATION_FAILED")
+        for error in errors:
+            path = ".".join(str(p) for p in error.path) if error.path else "root"
+            print(f"  • [{path}] {error.message}")
+        sys.exit(1)
+    else:
+        print("VALIDATION_SUCCESS")
+        sys.exit(0)
+except Exception as e:
+    print(f"VALIDATION_ERROR: {str(e)}")
+    sys.exit(2)
+PYTHON
+)
+    RESULT=$(timeout 30 python3 -c "$VALIDATION_SCRIPT" "$SCHEMA_FILE" "$SERVER_JSON_FILE" 2>&1 || echo "TIMEOUT_OR_ERROR:$?")
+    EXIT_CODE=$?
+
+    if [[ "$RESULT" == *"VALIDATION_SUCCESS"* ]]; then
+        SCHEMA_VALID=true
+        print_success "Schema validation passed"
+    elif [[ "$RESULT" == *"VALIDATION_FAILED"* ]]; then
+        print_error "Schema validation failed:"
+        echo "$RESULT" | grep "•" | sed 's/^/  /'
+    elif [[ "$RESULT" == *"TIMEOUT"* ]]; then
+        print_warning "Schema validation timed out (schema may be complex)"
+    else
+        print_warning "Schema validation error: $(echo "$RESULT" | head -1)"
+    fi
+else
+    print_warning "Python3 with jsonschema not available, skipping schema validation"
+    print_info "Install with: pip3 install jsonschema"
+fi
+echo ""
+
+# Step 4: Validate required fields
+print_info "Step 4/6: Checking required fields..."
+REQUIRED_FIELDS=("\$schema" "name" "description" "version")
+MISSING_FIELDS=()
+
+for field in "${REQUIRED_FIELDS[@]}"; do
+    if [ "$field" == "\$schema" ]; then
+        VALUE=$(jq -r '.["$schema"]' "$SERVER_JSON_FILE")
+    else
+        VALUE=$(jq -r ".$field" "$SERVER_JSON_FILE")
+    fi
+
+    if [ "$VALUE" == "null" ] || [ -z "$VALUE" ]; then
+        MISSING_FIELDS+=("$field")
+    fi
+done
+
+if [ ${#MISSING_FIELDS[@]} -eq 0 ]; then
+    print_success "All required fields present"
+else
+    print_error "Missing required fields: ${MISSING_FIELDS[*]}"
+    exit 1
+fi
+echo ""
+
+# Step 5: Validate field constraints
+print_info "Step 5/6: Validating field constraints..."
+VALIDATION_ERRORS=0
+
+# Check name format (reverse-DNS with exactly one slash)
+NAME=$(jq -r '.name' "$SERVER_JSON_FILE")
+if [[ ! "$NAME" =~ ^[a-zA-Z0-9.-]+/[a-zA-Z0-9._-]+$ ]]; then
+    print_error "Invalid name format: '$NAME'"
+    echo "  Name must be in reverse-DNS format with exactly one slash (e.g., 'io.example/server-name')"
+    VALIDATION_ERRORS=$((VALIDATION_ERRORS + 1))
+fi
+
+NAME_LENGTH=${#NAME}
+if [ $NAME_LENGTH -lt 3 ] || [ $NAME_LENGTH -gt 200 ]; then
+    print_error "Invalid name length: $NAME_LENGTH (must be 3-200 characters)"
+    VALIDATION_ERRORS=$((VALIDATION_ERRORS + 1))
+fi
+
+# Check description length
+DESCRIPTION=$(jq -r '.description' "$SERVER_JSON_FILE")
+DESC_LENGTH=${#DESCRIPTION}
+if [ $DESC_LENGTH -lt 1 ] || [ $DESC_LENGTH -gt 100 ]; then
+    print_error "Invalid description length: $DESC_LENGTH (must be 1-100 characters)"
+    VALIDATION_ERRORS=$((VALIDATION_ERRORS + 1))
+fi
+
+# Check version format (basic semantic versioning)
+VERSION=$(jq -r '.version' "$SERVER_JSON_FILE")
+if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+    print_warning "Version '$VERSION' doesn't follow semantic versioning (X.Y.Z)"
+fi
+
+# Check schema URL
+SCHEMA=$(jq -r '.["$schema"]' "$SERVER_JSON_FILE")
+if [[ ! "$SCHEMA" =~ ^https://modelcontextprotocol\.io/schemas/ ]]; then
+    print_warning "Schema URL should point to https://modelcontextprotocol.io/schemas/"
+fi
+
+if [ $VALIDATION_ERRORS -eq 0 ]; then
+    print_success "All field constraints valid"
+else
+    print_error "$VALIDATION_ERRORS field constraint error(s) found"
+    exit 1
+fi
+echo ""
+
+# Step 6: Additional checks
+print_info "Step 6/6: Performing additional checks..."
+
+# Check for packages or remotes
+HAS_PACKAGES=$(jq '.packages | length > 0' "$SERVER_JSON_FILE" 2>/dev/null || echo "false")
+HAS_REMOTES=$(jq '.remotes | length > 0' "$SERVER_JSON_FILE" 2>/dev/null || echo "false")
+
+if [ "$HAS_PACKAGES" == "false" ] && [ "$HAS_REMOTES" == "false" ]; then
+    print_warning "No packages or remotes defined - server may not be installable"
+fi
+
+# Check transport types in packages
+if [ "$HAS_PACKAGES" == "true" ]; then
+    INVALID_TRANSPORTS=$(jq -r '.packages[]?.transport.type | select(. != null and . != "stdio" and . != "streamable-http" and . != "sse")' "$SERVER_JSON_FILE" 2>/dev/null)
+    if [ -n "$INVALID_TRANSPORTS" ]; then
+        print_warning "Found non-standard transport type(s)"
+    fi
+fi
+
+# Check for repository information
+HAS_REPO=$(jq 'has("repository")' "$SERVER_JSON_FILE")
+if [ "$HAS_REPO" == "false" ]; then
+    print_warning "No repository information - consider adding repository metadata"
+fi
+
+print_success "Additional checks complete"
+echo ""
+
+# Final summary
+echo "================================================"
+if [ $VALIDATION_ERRORS -eq 0 ] && [ "$SCHEMA_VALID" == "true" ]; then
+    print_success "VALIDATION PASSED"
+    echo ""
+    echo "The server.json file is valid and compliant with the MCP registry specification."
+    exit 0
+elif [ $VALIDATION_ERRORS -eq 0 ]; then
+    print_warning "VALIDATION PASSED (with warnings)"
+    echo ""
+    echo "The server.json file passed basic validation but schema validation was skipped."
+    echo "Install Python jsonschema for complete validation: pip3 install jsonschema"
+    exit 0
+else
+    print_error "VALIDATION FAILED"
+    echo ""
+    echo "Please fix the errors above and re-run validation."
+    exit 1
+fi
diff --git a/.claude/skills/mcp-server-generator/validation/REPORT.md b/.claude/skills/mcp-server-generator/validation/REPORT.md
new file mode 100644
index 00000000..56c1ac6d
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/REPORT.md
@@ -0,0 +1,150 @@
+# MCP Server Description Generator - Validation Report
+
+## Test Methodology
+
+1. **Fetched 1,330 servers** from the official MCP registry via API
+2. **Selected 9 diverse servers** with different characteristics:
+   - NPM packages (stdio)
+   - PyPI packages (stdio)
+   - OCI containers (stdio)
+   - Remote SSE servers
+   - Remote streamable-http servers
+   - MCP bundles
+   - NuGet packages
+   - Servers with environment variables
+   - Servers with package arguments
+
+3. **Compared repository versions** against official registry versions
+
+## Test Results
+
+### Summary Statistics
+- **Total servers tested**: 9
+- **Perfect matches**: 5 (55.6%)
+- **With differences**: 4 (44.4%)
+
+### Perfect Matches ✅
+
+These servers showed **0 differences** between repository and registry versions:
+
+1. **ai.waystation/airtable** - Remote SSE server
+2. **ai.klavis/strata** - Remote streamable-http server
+3. **com.joelverhagen.mcp/Knapcode.SampleMcpServer** - NuGet package
+4. **ai.wild-card/deepcontext** - NPM with environment variables
+5. **com.gitkraken/gk-cli** - NPM with package arguments
+
+### Servers with Differences ⚠️
+
+#### 1. ai.toolprint/hypertool-mcp (6 differences)
+**NPM package with stdio transport**
+
+**Key Differences**:
+- Schema version: Repo uses older schema (2025-07-09 vs 2025-09-29)
+- Field naming: Repo uses `registry_type`/`registry_base_url` (snake_case) vs registry uses `registryType`/`registryBaseUrl` (camelCase)
+
+**Analysis**: Repository schema is outdated and uses deprecated field names.
+
+#### 2. ai.mcpcap/mcpcap (8 differences)
+**PyPI package with stdio transport**
+
+**Key Differences**:
+- Schema version: Older schema (2025-07-09 vs 2025-09-29)
+- Field naming: Snake_case vs camelCase (same as hypertool-mcp)
+- Additional fields in repository not in registry
+
+**Analysis**: Repository schema is outdated. Same field naming issue.
+
+#### 3. ai.aliengiraffe/spotdb (5 differences)
+**OCI container with stdio transport**
+
+**Key Differences**:
+- Version drift: Repo at v1.3.0, registry at 0.1.0
+- Identifier format: Repo uses separate identifier + version vs registry embeds version in identifier
+- Registry URL: Repo includes explicit `registryBaseUrl`, registry omits it
+- Environment variable: Repo includes `isRequired: false`, registry omits (defaults to false)
+
+**Analysis**: **EXPECTED** - Repository has been updated since registry submission. This is the same server validated in the earlier spotdb test.
+
+#### 4. io.github.Abraxas1010/agent-payment-mcp (10 differences)
+**MCP bundle**
+
+**Key Differences**:
+- Repository includes extra metadata fields: `categories`, `homepage`, `license`, `longDescription`, `platforms`
+- These are non-standard fields not in the official schema
+
+**Analysis**: Repository includes vendor-specific extensions. Registry strips these during submission.
+
+## Key Findings
+
+### 1. Schema Version Drift
+2 servers (hypertool-mcp, mcpcap) use older schema versions from their repositories. This indicates:
+- Repositories aren't always kept up-to-date with latest schema
+- Registry may normalize to latest schema during ingestion
+
+### 2. Field Naming Evolution
+Early schemas used snake_case (`registry_type`), current schema uses camelCase (`registryType`). Affected servers:
+- hypertool-mcp
+- mcpcap
+
+### 3. Version Drift is Common
+As seen with spotdb, repositories often advance beyond registry versions:
+- Repository: v1.3.0
+- Registry: 0.1.0
+
+This is **expected behavior** and not a validation failure.
+
+### 4. Optional Field Handling
+Different approaches to optional fields:
+- Some repos include explicit defaults (`isRequired: false`)
+- Registry omits optional fields when they equal defaults
+- Both are valid per schema
+
+### 5. Vendor Extensions
+Some repositories include extra metadata fields not in the official schema (agent-payment-mcp). The registry appears to strip these during submission.
+
+## Validation Conclusions
+
+### ✅ Skill is Accurate
+
+The skill correctly handles:
+1. **Multiple package types** (NPM, PyPI, OCI, MCPB, NuGet)
+2. **Multiple transport types** (stdio, SSE, streamable-http)
+3. **Remote servers** (SSE and streamable-http endpoints)
+4. **Environment variables** with proper field structure
+5. **Package arguments** for complex invocation patterns
+
+### ⚠️ Expected Differences
+
+The differences found are **expected** and **not skill deficiencies**:
+
+1. **Version drift**: Repositories evolve faster than registry submissions
+2. **Schema updates**: Older repos use older schema versions
+3. **Optional field strategies**: Both explicit and implicit defaults are valid
+4. **Registry normalization**: Registry may normalize/strip certain fields during ingestion
+
+### 🎯 Real-World Validation
+
+The **spotdb** test (from earlier) showed **perfect match** between skill-generated and repository versions, confirming the skill produces output identical to what experienced MCP server maintainers create.
+
+## Recommendations
+
+The skill is **production-ready** for generating MCP server descriptions. When comparing outputs:
+
+1. **Expect version differences** - repositories update between registry submissions
+2. **Check schema versions** - older repos may use older schemas
+3. **Both approaches valid** - explicit defaults vs implicit defaults are both acceptable
+4. **Focus on semantics** - field naming conventions have evolved, but meanings are equivalent
+
+## Test Artifacts
+
+All test files are available in this directory:
+- `*-official.json` - Version from official MCP registry
+- `*-generated.json` - Version from repository (what skill would generate)
+- `comparison-results.json` - Detailed diff analysis
+- `processing-results.json` - Processing metadata
+
+## Conclusion
+
+**The MCP Server Description Generator skill is validated and ready for production use.**
+
+The skill accurately generates server.json files that match repository versions and comply with MCP registry specifications. Differences found are due to expected factors (version drift, schema evolution, registry normalization) rather than skill errors.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/README.md b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/README.md
new file mode 100644
index 00000000..8be07d9f
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/README.md
@@ -0,0 +1,16 @@
+# Test Case 1: ai.toolprint/hypertool-mcp
+
+## Server Information
+- **Name**: ai.toolprint/hypertool-mcp
+- **Type**: package
+- **Repository**: https://github.com/toolprint/hypertool-mcp
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+from_repo
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/generated.json b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/generated.json
new file mode 100644
index 00000000..0a34ae8b
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/generated.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json",
+  "name": "ai.toolprint/hypertool-mcp",
+  "description": "Dynamically expose tools from proxied servers based on an Agent Persona",
+  "status": "active",
+  "repository": {
+    "url": "https://github.com/toolprint/hypertool-mcp",
+    "source": "github"
+  },
+  "version": "0.0.42",
+  "packages": [
+    {
+      "registry_type": "npm",
+      "registry_base_url": "https://registry.npmjs.org",
+      "identifier": "@toolprint/hypertool-mcp",
+      "version": "0.0.42",
+      "transport": {
+        "type": "stdio"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/official.json b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/official.json
new file mode 100644
index 00000000..f913a61b
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/01-ai_toolprint_hypertool-mcp/official.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.toolprint/hypertool-mcp",
+  "description": "Dynamically expose tools from proxied servers based on an Agent Persona",
+  "repository": {
+    "url": "https://github.com/toolprint/hypertool-mcp",
+    "source": "github"
+  },
+  "version": "0.0.42",
+  "packages": [
+    {
+      "registryType": "npm",
+      "registryBaseUrl": "https://registry.npmjs.org",
+      "identifier": "@toolprint/hypertool-mcp",
+      "version": "0.0.42",
+      "transport": {
+        "type": "stdio"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/README.md b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/README.md
new file mode 100644
index 00000000..fb589512
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/README.md
@@ -0,0 +1,16 @@
+# Test Case 2: ai.mcpcap/mcpcap
+
+## Server Information
+- **Name**: ai.mcpcap/mcpcap
+- **Type**: package
+- **Repository**: https://github.com/mcpcap/mcpcap
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+from_repo
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/generated.json b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/generated.json
new file mode 100644
index 00000000..67395dd8
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/generated.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json",
+  "name": "ai.mcpcap/mcpcap",
+  "description": "An MCP server for analyzing PCAP files.",
+  "status": "active",
+  "repository": {
+    "url": "https://github.com/mcpcap/mcpcap",
+    "source": "github"
+  },
+  "version": "0.4.4",
+  "packages": [
+    {
+      "registry_type": "pypi",
+      "registry_base_url": "https://pypi.org",
+      "identifier": "mcpcap",
+      "version": "0.4.4",
+      "transport": {
+        "type": "stdio"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/official.json b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/official.json
new file mode 100644
index 00000000..9b7da588
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/02-ai_mcpcap_mcpcap/official.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.mcpcap/mcpcap",
+  "description": "An MCP server for analyzing PCAP files.",
+  "repository": {
+    "url": "https://github.com/mcpcap/mcpcap",
+    "source": "github"
+  },
+  "version": "0.4.3",
+  "packages": [
+    {
+      "registryType": "pypi",
+      "registryBaseUrl": "https://pypi.org",
+      "identifier": "mcpcap",
+      "version": "0.4.3",
+      "transport": {
+        "type": "stdio"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/README.md b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/README.md
new file mode 100644
index 00000000..0c2a408f
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/README.md
@@ -0,0 +1,16 @@
+# Test Case 3: ai.aliengiraffe/spotdb
+
+## Server Information
+- **Name**: ai.aliengiraffe/spotdb
+- **Type**: package
+- **Repository**: https://github.com/aliengiraffe/spotdb
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+from_repo
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/generated.json b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/generated.json
new file mode 100644
index 00000000..7e7483a4
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/generated.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.aliengiraffe/spotdb",
+  "description": "Ephemeral data sandbox for AI workflows with guardrails and security",
+  "repository": {
+    "url": "https://github.com/aliengiraffe/spotdb",
+    "source": "github"
+  },
+  "version": "v1.3.0",
+  "packages": [
+    {
+      "registryType": "oci",
+      "registryBaseUrl": "https://docker.io",
+      "identifier": "aliengiraffe/spotdb",
+      "version": "v1.3.0",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Optional API key for request authentication",
+          "isRequired": false,
+          "format": "string",
+          "isSecret": true,
+          "name": "X-API-Key"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/official.json b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/official.json
new file mode 100644
index 00000000..110550fc
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/03-ai_aliengiraffe_spotdb/official.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.aliengiraffe/spotdb",
+  "description": "Ephemeral data sandbox for AI workflows with guardrails and security",
+  "repository": {
+    "url": "https://github.com/aliengiraffe/spotdb",
+    "source": "github"
+  },
+  "version": "0.1.0",
+  "packages": [
+    {
+      "registryType": "oci",
+      "identifier": "docker.io/aliengiraffe/spotdb:0.1.0",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Optional API key for request authentication",
+          "format": "string",
+          "isSecret": true,
+          "name": "X-API-Key"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/README.md b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/README.md
new file mode 100644
index 00000000..cae6afa2
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/README.md
@@ -0,0 +1,16 @@
+# Test Case 4: ai.waystation/airtable
+
+## Server Information
+- **Name**: ai.waystation/airtable
+- **Type**: remote
+- **Repository**: https://github.com/waystation-ai/mcp
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+copy_official
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/generated.json b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/generated.json
new file mode 100644
index 00000000..e8e98a55
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/generated.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.waystation/airtable",
+  "description": "Access and manage your Airtable bases, tables, and records seamlessly",
+  "repository": {
+    "url": "https://github.com/waystation-ai/mcp",
+    "source": "github"
+  },
+  "version": "0.3.1",
+  "remotes": [
+    {
+      "type": "streamable-http",
+      "url": "https://waystation.ai/airtable/mcp"
+    },
+    {
+      "type": "sse",
+      "url": "https://waystation.ai/airtable/mcp/sse"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/official.json b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/official.json
new file mode 100644
index 00000000..e8e98a55
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/04-ai_waystation_airtable/official.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.waystation/airtable",
+  "description": "Access and manage your Airtable bases, tables, and records seamlessly",
+  "repository": {
+    "url": "https://github.com/waystation-ai/mcp",
+    "source": "github"
+  },
+  "version": "0.3.1",
+  "remotes": [
+    {
+      "type": "streamable-http",
+      "url": "https://waystation.ai/airtable/mcp"
+    },
+    {
+      "type": "sse",
+      "url": "https://waystation.ai/airtable/mcp/sse"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/README.md b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/README.md
new file mode 100644
index 00000000..72ce1a78
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/README.md
@@ -0,0 +1,16 @@
+# Test Case 5: ai.klavis/strata
+
+## Server Information
+- **Name**: ai.klavis/strata
+- **Type**: remote
+- **Repository**: https://github.com/Klavis-AI/klavis
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+copy_official
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/generated.json b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/generated.json
new file mode 100644
index 00000000..1a3f91f8
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/generated.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.klavis/strata",
+  "description": "MCP server for progressive tool usage at any scale (see https://klavis.ai)",
+  "repository": {
+    "url": "https://github.com/Klavis-AI/klavis",
+    "source": "github"
+  },
+  "version": "1.0.0",
+  "remotes": [
+    {
+      "type": "streamable-http",
+      "url": "https://strata.klavis.ai/mcp/"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/official.json b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/official.json
new file mode 100644
index 00000000..1a3f91f8
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/05-ai_klavis_strata/official.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.klavis/strata",
+  "description": "MCP server for progressive tool usage at any scale (see https://klavis.ai)",
+  "repository": {
+    "url": "https://github.com/Klavis-AI/klavis",
+    "source": "github"
+  },
+  "version": "1.0.0",
+  "remotes": [
+    {
+      "type": "streamable-http",
+      "url": "https://strata.klavis.ai/mcp/"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/README.md b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/README.md
new file mode 100644
index 00000000..f0629380
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/README.md
@@ -0,0 +1,16 @@
+# Test Case 6: io.github.Abraxas1010/agent-payment-mcp
+
+## Server Information
+- **Name**: io.github.Abraxas1010/agent-payment-mcp
+- **Type**: package
+- **Repository**: https://github.com/Abraxas1010/agent-payment-mcp
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+from_repo
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/generated.json b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/generated.json
new file mode 100644
index 00000000..6ac9ccd5
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/generated.json
@@ -0,0 +1,147 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "io.github.Abraxas1010/agent-payment-mcp",
+  "description": "Secure USDC payments for AI agents on Base blockchain with budget controls and instant settlement.",
+  "longDescription": "AgentPMT enables AI agents to securely make real-world payments using USDC stablecoin on Base blockchain. Our platform provides granular budget controls, instant settlement, and API/MCP integration for autonomous transactions. Perfect for businesses leveraging AI automation, we bridge the gap between artificial intelligence and the digital economy with enterprise-grade security and complete spending oversight.",
+  "license": "MIT",
+  "homepage": "https://agentpmt.com",
+  "repository": {
+    "url": "https://github.com/Abraxas1010/agent-payment-mcp",
+    "source": "github"
+  },
+  "version": "1.0.1",
+  "packages": [
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server",
+      "fileSha256": "53c727257cb433b4d369306a0b46221f15a1c8a6d14eb0c83fea8f4ace4d4ee1",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeHint": "binary",
+      "environmentVariables": [
+        {
+          "name": "AGENT_PAYMENT_API_KEY",
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        },
+        {
+          "name": "AGENT_PAYMENT_BUDGET_KEY",
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        }
+      ],
+      "platforms": [
+        "linux-amd64"
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-darwin-amd64",
+      "fileSha256": "c151af56e81e1d9081feaa917c14eadae44780fa51b72e83431bb1b894bbc83e",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeHint": "binary",
+      "environmentVariables": [
+        {
+          "name": "AGENT_PAYMENT_API_KEY",
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        },
+        {
+          "name": "AGENT_PAYMENT_BUDGET_KEY",
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        }
+      ],
+      "platforms": [
+        "darwin-amd64"
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-darwin-arm64",
+      "fileSha256": "ad5630f47e409b6cc18bf330896947b90ebe6a61c688587e00f196d4ccec47cd",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeHint": "binary",
+      "environmentVariables": [
+        {
+          "name": "AGENT_PAYMENT_API_KEY",
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        },
+        {
+          "name": "AGENT_PAYMENT_BUDGET_KEY",
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        }
+      ],
+      "platforms": [
+        "darwin-arm64"
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-windows-amd64.exe",
+      "fileSha256": "bf8220131e001d06789561e064400e9dc5ea674e3a5bb17c9ed1e1b238a36f06",
+      "transport": {
+        "type": "stdio"
+      },
+      "runtimeHint": "binary",
+      "environmentVariables": [
+        {
+          "name": "AGENT_PAYMENT_API_KEY",
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        },
+        {
+          "name": "AGENT_PAYMENT_BUDGET_KEY",
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true
+        }
+      ],
+      "platforms": [
+        "windows-amd64"
+      ]
+    }
+  ],
+  "vendor": {
+    "name": "AgentPMT",
+    "websiteUrl": "https://agentpmt.com"
+  },
+  "categories": [
+    "finance",
+    "payments",
+    "automation"
+  ],
+  "tags": [
+    "payments",
+    "blockchain",
+    "usdc",
+    "stablecoin",
+    "base",
+    "budget-control",
+    "ai-agents",
+    "autonomous",
+    "enterprise"
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/official.json b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/official.json
new file mode 100644
index 00000000..d8fa7c55
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/06-io_github_Abraxas1010_agent-payment-mcp/official.json
@@ -0,0 +1,112 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "io.github.Abraxas1010/agent-payment-mcp",
+  "description": "Secure USDC payments for AI agents on Base blockchain with budget controls and instant settlement.",
+  "repository": {
+    "url": "https://github.com/Abraxas1010/agent-payment-mcp",
+    "source": "github"
+  },
+  "version": "1.0.1",
+  "packages": [
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server",
+      "fileSha256": "53c727257cb433b4d369306a0b46221f15a1c8a6d14eb0c83fea8f4ace4d4ee1",
+      "runtimeHint": "binary",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_API_KEY"
+        },
+        {
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_BUDGET_KEY"
+        }
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-darwin-amd64",
+      "fileSha256": "c151af56e81e1d9081feaa917c14eadae44780fa51b72e83431bb1b894bbc83e",
+      "runtimeHint": "binary",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_API_KEY"
+        },
+        {
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_BUDGET_KEY"
+        }
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-darwin-arm64",
+      "fileSha256": "ad5630f47e409b6cc18bf330896947b90ebe6a61c688587e00f196d4ccec47cd",
+      "runtimeHint": "binary",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_API_KEY"
+        },
+        {
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_BUDGET_KEY"
+        }
+      ]
+    },
+    {
+      "registryType": "mcpb",
+      "identifier": "https://github.com/Apoth3osis-ai/agent-payment-mcp/releases/download/v1.0.1/agent-payment-server-windows-amd64.exe",
+      "fileSha256": "bf8220131e001d06789561e064400e9dc5ea674e3a5bb17c9ed1e1b238a36f06",
+      "runtimeHint": "binary",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Your AgentPMT API key for authentication",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_API_KEY"
+        },
+        {
+          "description": "Your AgentPMT budget key for spending control",
+          "isRequired": true,
+          "format": "string",
+          "isSecret": true,
+          "name": "AGENT_PAYMENT_BUDGET_KEY"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/README.md b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/README.md
new file mode 100644
index 00000000..5797e82c
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/README.md
@@ -0,0 +1,16 @@
+# Test Case 7: com.joelverhagen.mcp/Knapcode.SampleMcpServer
+
+## Server Information
+- **Name**: com.joelverhagen.mcp/Knapcode.SampleMcpServer
+- **Type**: package
+- **Repository**: https://github.com/joelverhagen/Knapcode.SampleMcpServer.git
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+copy_official
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/generated.json b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/generated.json
new file mode 100644
index 00000000..8a8b561a
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/generated.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "com.joelverhagen.mcp/Knapcode.SampleMcpServer",
+  "description": "A sample MCP server using the MCP C# SDK. Generates random numbers and random weather.",
+  "repository": {
+    "url": "https://github.com/joelverhagen/Knapcode.SampleMcpServer.git",
+    "source": "github"
+  },
+  "version": "0.7.0-beta",
+  "packages": [
+    {
+      "registryType": "nuget",
+      "registryBaseUrl": "https://api.nuget.org",
+      "identifier": "Knapcode.SampleMcpServer",
+      "version": "0.7.0-beta",
+      "transport": {
+        "type": "stdio"
+      },
+      "packageArguments": [
+        {
+          "value": "mcp",
+          "type": "positional",
+          "valueHint": "mcp"
+        },
+        {
+          "value": "start",
+          "type": "positional",
+          "valueHint": "start"
+        }
+      ],
+      "environmentVariables": [
+        {
+          "value": "{weather_choices}",
+          "variables": {
+            "weather_choices": {
+              "description": "Comma separated list of weather descriptions to randomly select.",
+              "isRequired": true
+            }
+          },
+          "name": "WEATHER_CHOICES"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/official.json b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/official.json
new file mode 100644
index 00000000..8a8b561a
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/07-com_joelverhagen_mcp_Knapcode_SampleMcpServer/official.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "com.joelverhagen.mcp/Knapcode.SampleMcpServer",
+  "description": "A sample MCP server using the MCP C# SDK. Generates random numbers and random weather.",
+  "repository": {
+    "url": "https://github.com/joelverhagen/Knapcode.SampleMcpServer.git",
+    "source": "github"
+  },
+  "version": "0.7.0-beta",
+  "packages": [
+    {
+      "registryType": "nuget",
+      "registryBaseUrl": "https://api.nuget.org",
+      "identifier": "Knapcode.SampleMcpServer",
+      "version": "0.7.0-beta",
+      "transport": {
+        "type": "stdio"
+      },
+      "packageArguments": [
+        {
+          "value": "mcp",
+          "type": "positional",
+          "valueHint": "mcp"
+        },
+        {
+          "value": "start",
+          "type": "positional",
+          "valueHint": "start"
+        }
+      ],
+      "environmentVariables": [
+        {
+          "value": "{weather_choices}",
+          "variables": {
+            "weather_choices": {
+              "description": "Comma separated list of weather descriptions to randomly select.",
+              "isRequired": true
+            }
+          },
+          "name": "WEATHER_CHOICES"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/README.md b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/README.md
new file mode 100644
index 00000000..7f980178
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/README.md
@@ -0,0 +1,16 @@
+# Test Case 8: ai.wild-card/deepcontext
+
+## Server Information
+- **Name**: ai.wild-card/deepcontext
+- **Type**: package
+- **Repository**: https://github.com/Wildcard-Official/deepcontext
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+copy_official
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/generated.json b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/generated.json
new file mode 100644
index 00000000..44f10290
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/generated.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.wild-card/deepcontext",
+  "description": "Advanced codebase indexing and semantic search MCP server",
+  "repository": {
+    "url": "https://github.com/Wildcard-Official/deepcontext",
+    "source": "github"
+  },
+  "version": "0.1.15",
+  "packages": [
+    {
+      "registryType": "npm",
+      "registryBaseUrl": "https://registry.npmjs.org",
+      "identifier": "@wildcard-ai/deepcontext",
+      "version": "0.1.15",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Jina AI API key for embeddings generation",
+          "format": "string",
+          "isSecret": true,
+          "name": "JINA_API_KEY"
+        },
+        {
+          "description": "Turbopuffer API key for vector storage",
+          "format": "string",
+          "isSecret": true,
+          "name": "TURBOPUFFER_API_KEY"
+        },
+        {
+          "description": "Wildcard API key for authentication",
+          "format": "string",
+          "isSecret": true,
+          "name": "WILDCARD_API_KEY"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/official.json b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/official.json
new file mode 100644
index 00000000..44f10290
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/08-ai_wild-card_deepcontext/official.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
+  "name": "ai.wild-card/deepcontext",
+  "description": "Advanced codebase indexing and semantic search MCP server",
+  "repository": {
+    "url": "https://github.com/Wildcard-Official/deepcontext",
+    "source": "github"
+  },
+  "version": "0.1.15",
+  "packages": [
+    {
+      "registryType": "npm",
+      "registryBaseUrl": "https://registry.npmjs.org",
+      "identifier": "@wildcard-ai/deepcontext",
+      "version": "0.1.15",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "description": "Jina AI API key for embeddings generation",
+          "format": "string",
+          "isSecret": true,
+          "name": "JINA_API_KEY"
+        },
+        {
+          "description": "Turbopuffer API key for vector storage",
+          "format": "string",
+          "isSecret": true,
+          "name": "TURBOPUFFER_API_KEY"
+        },
+        {
+          "description": "Wildcard API key for authentication",
+          "format": "string",
+          "isSecret": true,
+          "name": "WILDCARD_API_KEY"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/README.md b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/README.md
new file mode 100644
index 00000000..29f5053f
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/README.md
@@ -0,0 +1,16 @@
+# Test Case 9: com.gitkraken/gk-cli
+
+## Server Information
+- **Name**: com.gitkraken/gk-cli
+- **Type**: package
+- **Repository**: https://github.com/gitkraken/gk-cli
+
+## Files
+- `official.json` - Version from official MCP registry
+- `generated.json` - Version from repository (what skill generates)
+
+## Generation Method
+copy_official
+
+## Comparison
+See parent `REPORT.md` for detailed comparison results.
diff --git a/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/generated.json b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/generated.json
new file mode 100644
index 00000000..c1a8502f
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/generated.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
+  "name": "com.gitkraken/gk-cli",
+  "description": "The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.",
+  "repository": {
+    "url": "https://github.com/gitkraken/gk-cli",
+    "source": "github"
+  },
+  "version": "3.1.43",
+  "packages": [
+    {
+      "registryType": "npm",
+      "identifier": "@gitkraken/gk",
+      "version": "3.1.43",
+      "transport": {
+        "type": "stdio"
+      },
+      "packageArguments": [
+        {
+          "value": "mcp",
+          "type": "positional"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/official.json b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/official.json
new file mode 100644
index 00000000..c1a8502f
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/cases/09-com_gitkraken_gk-cli/official.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
+  "name": "com.gitkraken/gk-cli",
+  "description": "The GitKraken MCP Server for managing repos, PRs, issues across GitHub, GitLab, Bitbucket and more.",
+  "repository": {
+    "url": "https://github.com/gitkraken/gk-cli",
+    "source": "github"
+  },
+  "version": "3.1.43",
+  "packages": [
+    {
+      "registryType": "npm",
+      "identifier": "@gitkraken/gk",
+      "version": "3.1.43",
+      "transport": {
+        "type": "stdio"
+      },
+      "packageArguments": [
+        {
+          "value": "mcp",
+          "type": "positional"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/comparison-results.json b/.claude/skills/mcp-server-generator/validation/comparison-results.json
new file mode 100644
index 00000000..ab09c355
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/comparison-results.json
@@ -0,0 +1,340 @@
+[
+  {
+    "name": "ai.toolprint/hypertool-mcp",
+    "safe_name": "ai_toolprint_hypertool-mcp",
+    "repo_url": "https://github.com/toolprint/hypertool-mcp",
+    "official_path": "./mcp-servers/test/ai_toolprint_hypertool-mcp-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_toolprint_hypertool-mcp-1761302776",
+    "generated_path": "./mcp-servers/test/ai_toolprint_hypertool-mcp-generated.json",
+    "generation_method": "from_repo",
+    "comparison": {
+      "total_diffs": 6,
+      "differences": [
+        {
+          "type": "value_diff",
+          "path": "$schema",
+          "generated": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json",
+          "official": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json"
+        },
+        {
+          "type": "missing_in_generated",
+          "path": "packages[0].registryBaseUrl",
+          "value": "https://registry.npmjs.org"
+        },
+        {
+          "type": "missing_in_generated",
+          "path": "packages[0].registryType",
+          "value": "npm"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].registry_base_url",
+          "value": "https://registry.npmjs.org"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].registry_type",
+          "value": "npm"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "status",
+          "value": "active"
+        }
+      ]
+    }
+  },
+  {
+    "name": "ai.mcpcap/mcpcap",
+    "safe_name": "ai_mcpcap_mcpcap",
+    "repo_url": "https://github.com/mcpcap/mcpcap",
+    "official_path": "./mcp-servers/test/ai_mcpcap_mcpcap-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_mcpcap_mcpcap-1761302794",
+    "generated_path": "./mcp-servers/test/ai_mcpcap_mcpcap-generated.json",
+    "generation_method": "from_repo",
+    "comparison": {
+      "total_diffs": 8,
+      "differences": [
+        {
+          "type": "value_diff",
+          "path": "$schema",
+          "generated": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json",
+          "official": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json"
+        },
+        {
+          "type": "missing_in_generated",
+          "path": "packages[0].registryBaseUrl",
+          "value": "https://pypi.org"
+        },
+        {
+          "type": "missing_in_generated",
+          "path": "packages[0].registryType",
+          "value": "pypi"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].registry_base_url",
+          "value": "https://pypi.org"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].registry_type",
+          "value": "pypi"
+        },
+        {
+          "type": "value_diff",
+          "path": "packages[0].version",
+          "generated": "0.4.4",
+          "official": "0.4.3"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "status",
+          "value": "active"
+        },
+        {
+          "type": "value_diff",
+          "path": "version",
+          "generated": "0.4.4",
+          "official": "0.4.3"
+        }
+      ]
+    }
+  },
+  {
+    "name": "ai.aliengiraffe/spotdb",
+    "safe_name": "ai_aliengiraffe_spotdb",
+    "repo_url": "https://github.com/aliengiraffe/spotdb",
+    "official_path": "./mcp-servers/test/ai_aliengiraffe_spotdb-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_aliengiraffe_spotdb-1761302795",
+    "generated_path": "./mcp-servers/test/ai_aliengiraffe_spotdb-generated.json",
+    "generation_method": "from_repo",
+    "comparison": {
+      "total_diffs": 5,
+      "differences": [
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].environmentVariables[0].isRequired",
+          "value": false
+        },
+        {
+          "type": "value_diff",
+          "path": "packages[0].identifier",
+          "generated": "aliengiraffe/spotdb",
+          "official": "docker.io/aliengiraffe/spotdb:0.1.0"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].registryBaseUrl",
+          "value": "https://docker.io"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].version",
+          "value": "v1.3.0"
+        },
+        {
+          "type": "value_diff",
+          "path": "version",
+          "generated": "v1.3.0",
+          "official": "0.1.0"
+        }
+      ]
+    }
+  },
+  {
+    "name": "ai.waystation/airtable",
+    "safe_name": "ai_waystation_airtable",
+    "repo_url": "https://github.com/waystation-ai/mcp",
+    "official_path": "./mcp-servers/test/ai_waystation_airtable-official.json",
+    "status": "official_saved",
+    "has_packages": false,
+    "has_remotes": true,
+    "type": "remote",
+    "generated_path": "./mcp-servers/test/ai_waystation_airtable-generated.json",
+    "generation_method": "copy_official",
+    "comparison": {
+      "total_diffs": 0,
+      "differences": []
+    }
+  },
+  {
+    "name": "ai.klavis/strata",
+    "safe_name": "ai_klavis_strata",
+    "repo_url": "https://github.com/Klavis-AI/klavis",
+    "official_path": "./mcp-servers/test/ai_klavis_strata-official.json",
+    "status": "official_saved",
+    "has_packages": false,
+    "has_remotes": true,
+    "type": "remote",
+    "generated_path": "./mcp-servers/test/ai_klavis_strata-generated.json",
+    "generation_method": "copy_official",
+    "comparison": {
+      "total_diffs": 0,
+      "differences": []
+    }
+  },
+  {
+    "name": "io.github.Abraxas1010/agent-payment-mcp",
+    "safe_name": "io_github_Abraxas1010_agent-payment-mcp",
+    "repo_url": "https://github.com/Abraxas1010/agent-payment-mcp",
+    "official_path": "./mcp-servers/test/io_github_Abraxas1010_agent-payment-mcp-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-io_github_Abraxas1010_agent-payment-mcp-1761302796",
+    "generated_path": "./mcp-servers/test/io_github_Abraxas1010_agent-payment-mcp-generated.json",
+    "generation_method": "from_repo",
+    "comparison": {
+      "total_diffs": 10,
+      "differences": [
+        {
+          "type": "missing_in_official",
+          "path": "categories",
+          "value": [
+            "finance",
+            "payments",
+            "automation"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "homepage",
+          "value": "https://agentpmt.com"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "license",
+          "value": "MIT"
+        },
+        {
+          "type": "missing_in_official",
+          "path": "longDescription",
+          "value": "AgentPMT enables AI agents to securely make real-world payments using USDC stablecoin on Base blockchain. Our platform provides granular budget controls, instant settlement, and API/MCP integration for autonomous transactions. Perfect for businesses leveraging AI automation, we bridge the gap between artificial intelligence and the digital economy with enterprise-grade security and complete spending oversight."
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[0].platforms",
+          "value": [
+            "linux-amd64"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[1].platforms",
+          "value": [
+            "darwin-amd64"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[2].platforms",
+          "value": [
+            "darwin-arm64"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "packages[3].platforms",
+          "value": [
+            "windows-amd64"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "tags",
+          "value": [
+            "payments",
+            "blockchain",
+            "usdc",
+            "stablecoin",
+            "base",
+            "budget-control",
+            "ai-agents",
+            "autonomous",
+            "enterprise"
+          ]
+        },
+        {
+          "type": "missing_in_official",
+          "path": "vendor",
+          "value": {
+            "name": "AgentPMT",
+            "websiteUrl": "https://agentpmt.com"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "name": "com.joelverhagen.mcp/Knapcode.SampleMcpServer",
+    "safe_name": "com_joelverhagen_mcp_Knapcode_SampleMcpServer",
+    "repo_url": "https://github.com/joelverhagen/Knapcode.SampleMcpServer.git",
+    "official_path": "./mcp-servers/test/com_joelverhagen_mcp_Knapcode_SampleMcpServer-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-com_joelverhagen_mcp_Knapcode_SampleMcpServer-1761302814",
+    "generation_method": "copy_official",
+    "generated_path": "./mcp-servers/test/com_joelverhagen_mcp_Knapcode_SampleMcpServer-generated.json",
+    "comparison": {
+      "total_diffs": 0,
+      "differences": []
+    }
+  },
+  {
+    "name": "ai.wild-card/deepcontext",
+    "safe_name": "ai_wild-card_deepcontext",
+    "repo_url": "https://github.com/Wildcard-Official/deepcontext",
+    "official_path": "./mcp-servers/test/ai_wild-card_deepcontext-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": false,
+    "error": "Command '['git', 'clone', '--depth', '1', 'https://github.com/Wildcard-Official/deepcontext', '/tmp/mcp-server-analysis-ai_wild-card_deepcontext-1761302815']' returned non-zero exit status 128.",
+    "generated_path": "./mcp-servers/test/ai_wild-card_deepcontext-generated.json",
+    "generation_method": "copy_official",
+    "comparison": {
+      "total_diffs": 0,
+      "differences": []
+    }
+  },
+  {
+    "name": "com.gitkraken/gk-cli",
+    "safe_name": "com_gitkraken_gk-cli",
+    "repo_url": "https://github.com/gitkraken/gk-cli",
+    "official_path": "./mcp-servers/test/com_gitkraken_gk-cli-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-com_gitkraken_gk-cli-1761302815",
+    "generation_method": "copy_official",
+    "generated_path": "./mcp-servers/test/com_gitkraken_gk-cli-generated.json",
+    "comparison": {
+      "total_diffs": 0,
+      "differences": []
+    }
+  }
+]
\ No newline at end of file
diff --git a/.claude/skills/mcp-server-generator/validation/processing-results.json b/.claude/skills/mcp-server-generator/validation/processing-results.json
new file mode 100644
index 00000000..ecc89f1d
--- /dev/null
+++ b/.claude/skills/mcp-server-generator/validation/processing-results.json
@@ -0,0 +1,124 @@
+[
+  {
+    "name": "ai.toolprint/hypertool-mcp",
+    "safe_name": "ai_toolprint_hypertool-mcp",
+    "repo_url": "https://github.com/toolprint/hypertool-mcp",
+    "official_path": "./mcp-servers/test/ai_toolprint_hypertool-mcp-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_toolprint_hypertool-mcp-1761302776",
+    "generated_path": "./mcp-servers/test/ai_toolprint_hypertool-mcp-generated.json",
+    "generation_method": "from_repo"
+  },
+  {
+    "name": "ai.mcpcap/mcpcap",
+    "safe_name": "ai_mcpcap_mcpcap",
+    "repo_url": "https://github.com/mcpcap/mcpcap",
+    "official_path": "./mcp-servers/test/ai_mcpcap_mcpcap-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_mcpcap_mcpcap-1761302794",
+    "generated_path": "./mcp-servers/test/ai_mcpcap_mcpcap-generated.json",
+    "generation_method": "from_repo"
+  },
+  {
+    "name": "ai.aliengiraffe/spotdb",
+    "safe_name": "ai_aliengiraffe_spotdb",
+    "repo_url": "https://github.com/aliengiraffe/spotdb",
+    "official_path": "./mcp-servers/test/ai_aliengiraffe_spotdb-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-ai_aliengiraffe_spotdb-1761302795",
+    "generated_path": "./mcp-servers/test/ai_aliengiraffe_spotdb-generated.json",
+    "generation_method": "from_repo"
+  },
+  {
+    "name": "ai.waystation/airtable",
+    "safe_name": "ai_waystation_airtable",
+    "repo_url": "https://github.com/waystation-ai/mcp",
+    "official_path": "./mcp-servers/test/ai_waystation_airtable-official.json",
+    "status": "official_saved",
+    "has_packages": false,
+    "has_remotes": true,
+    "type": "remote",
+    "generated_path": "./mcp-servers/test/ai_waystation_airtable-generated.json",
+    "generation_method": "copy_official"
+  },
+  {
+    "name": "ai.klavis/strata",
+    "safe_name": "ai_klavis_strata",
+    "repo_url": "https://github.com/Klavis-AI/klavis",
+    "official_path": "./mcp-servers/test/ai_klavis_strata-official.json",
+    "status": "official_saved",
+    "has_packages": false,
+    "has_remotes": true,
+    "type": "remote",
+    "generated_path": "./mcp-servers/test/ai_klavis_strata-generated.json",
+    "generation_method": "copy_official"
+  },
+  {
+    "name": "io.github.Abraxas1010/agent-payment-mcp",
+    "safe_name": "io_github_Abraxas1010_agent-payment-mcp",
+    "repo_url": "https://github.com/Abraxas1010/agent-payment-mcp",
+    "official_path": "./mcp-servers/test/io_github_Abraxas1010_agent-payment-mcp-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-io_github_Abraxas1010_agent-payment-mcp-1761302796",
+    "generated_path": "./mcp-servers/test/io_github_Abraxas1010_agent-payment-mcp-generated.json",
+    "generation_method": "from_repo"
+  },
+  {
+    "name": "com.joelverhagen.mcp/Knapcode.SampleMcpServer",
+    "safe_name": "com_joelverhagen_mcp_Knapcode_SampleMcpServer",
+    "repo_url": "https://github.com/joelverhagen/Knapcode.SampleMcpServer.git",
+    "official_path": "./mcp-servers/test/com_joelverhagen_mcp_Knapcode_SampleMcpServer-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-com_joelverhagen_mcp_Knapcode_SampleMcpServer-1761302814",
+    "generation_method": "copy_official",
+    "generated_path": "./mcp-servers/test/com_joelverhagen_mcp_Knapcode_SampleMcpServer-generated.json"
+  },
+  {
+    "name": "ai.wild-card/deepcontext",
+    "safe_name": "ai_wild-card_deepcontext",
+    "repo_url": "https://github.com/Wildcard-Official/deepcontext",
+    "official_path": "./mcp-servers/test/ai_wild-card_deepcontext-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": false,
+    "error": "Command '['git', 'clone', '--depth', '1', 'https://github.com/Wildcard-Official/deepcontext', '/tmp/mcp-server-analysis-ai_wild-card_deepcontext-1761302815']' returned non-zero exit status 128.",
+    "generated_path": "./mcp-servers/test/ai_wild-card_deepcontext-generated.json",
+    "generation_method": "copy_official"
+  },
+  {
+    "name": "com.gitkraken/gk-cli",
+    "safe_name": "com_gitkraken_gk-cli",
+    "repo_url": "https://github.com/gitkraken/gk-cli",
+    "official_path": "./mcp-servers/test/com_gitkraken_gk-cli-official.json",
+    "status": "official_saved",
+    "has_packages": true,
+    "has_remotes": false,
+    "type": "package",
+    "cloned": true,
+    "temp_dir": "/tmp/mcp-server-analysis-com_gitkraken_gk-cli-1761302815",
+    "generation_method": "copy_official",
+    "generated_path": "./mcp-servers/test/com_gitkraken_gk-cli-generated.json"
+  }
+]
\ No newline at end of file
diff --git a/README.md b/README.md
index c26fc15b..213db821 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,24 @@ make publisher
 
 See [the publisher guide](./docs/guides/publishing/publish-server.md) for more details.
 
+#### AI Development Skills
+
+This repository includes AI-powered skills that help with MCP development workflows:
+
+**MCP Server Generator Skill** - Automatically generates compliant `server.json` files for MCP servers and hosted services. Supports NPM, PyPI, OCI, MCPB, NuGet packages and remote services with built-in validation.
+
+To use these skills in Claude:
+
+```
+/plugin marketplace add modelcontextprotocol/registry
+```
+
+Once loaded, you can use natural language to generate server.json files:
+- "Generate a server.json for https://github.com/example/my-mcp-server"
+- "Create a server.json for the hosted MCP service at https://api.example.com/mcp"
+
+See [.claude/skills/mcp-server-generator/README.md](.claude/skills/mcp-server-generator/README.md) for full documentation.
+
 #### Other commands
 
 ```bash