diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index e0e301a..e2e4324 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -11,9 +11,9 @@
   },
   "plugins": [
     {
-      "name": "full-stack-development",
+      "name": "claude-code-essentials",
       "source": "./",
-      "description": "Complete full-stack feature implementation with backend API design, frontend UI, mobile apps, testing, security audits, performance optimization, and deployment automation",
+      "description": "Code explanation, debugging, documentation generation, PR enhancement, and git workflow tools for daily development tasks",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -22,14 +22,64 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["full-stack", "api-design", "frontend", "mobile", "microservices", "deployment"],
+      "keywords": [
+        "beginner",
+        "starter",
+        "essential",
+        "code-explanation",
+        "debugging",
+        "documentation",
+        "git",
+        "pull-request"
+      ],
+      "category": "essentials",
+      "strict": false,
+      "commands": [
+        "./tools/code-explain.md",
+        "./tools/smart-debug.md",
+        "./tools/doc-generate.md",
+        "./tools/pr-enhance.md",
+        "./tools/onboard.md",
+        "./workflows/git-workflow.md"
+      ],
+      "agents": [
+        "./agents/code-reviewer.md",
+        "./agents/debugger.md",
+        "./agents/docs-architect.md",
+        "./agents/dx-optimizer.md",
+        "./agents/tutorial-engineer.md"
+      ]
+    },
+    {
+      "name": "full-stack-development",
+      "source": "./",
+      "description": "Multi-agent workflow orchestrating backend API design, frontend implementation, mobile development, testing, security review, and deployment automation for complete feature implementation",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "full-stack",
+        "api-design",
+        "frontend",
+        "mobile",
+        "microservices",
+        "deployment",
+        "react",
+        "nextjs",
+        "rest-api",
+        "graphql",
+        "typescript"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/feature-development.md",
-        "./workflows/full-stack-feature.md",
-        "./tools/api-scaffold.md",
-        "./tools/code-explain.md"
+        "./workflows/full-stack-feature.md"
       ],
       "agents": [
         "./agents/backend-architect.md",
@@ -44,9 +94,9 @@
       ]
     },
     {
-      "name": "security-hardening",
+      "name": "api-development-kit",
       "source": "./",
-      "description": "Comprehensive security workflow with threat modeling, vulnerability assessment, penetration testing, security code review, and compliance validation",
+      "description": "REST and GraphQL API scaffolding, OpenAPI documentation generation, request mocking, security scanning, and input validation for backend API development",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -55,7 +105,190 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["security", "vulnerability-assessment", "owasp", "penetration-testing", "compliance"],
+      "keywords": [
+        "api",
+        "rest",
+        "graphql",
+        "openapi",
+        "swagger",
+        "fastapi",
+        "express",
+        "spring-boot",
+        "django",
+        "microservices",
+        "authentication",
+        "jwt"
+      ],
+      "category": "development",
+      "strict": false,
+      "commands": [
+        "./tools/api-scaffold.md",
+        "./tools/api-mock.md",
+        "./tools/security-scan.md",
+        "./tools/data-validation.md"
+      ],
+      "agents": [
+        "./agents/backend-architect.md",
+        "./agents/graphql-architect.md",
+        "./agents/api-documenter.md",
+        "./agents/backend-security-coder.md",
+        "./agents/fastapi-pro.md",
+        "./agents/django-pro.md"
+      ]
+    },
+    {
+      "name": "testing-quality-suite",
+      "source": "./",
+      "description": "Test-driven development workflows, automated test generation, test harness setup, and multi-perspective code review for unit, integration, and end-to-end testing",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "testing",
+        "tdd",
+        "test-automation",
+        "quality-assurance",
+        "unit-tests",
+        "integration-tests",
+        "e2e",
+        "jest",
+        "pytest",
+        "cypress",
+        "playwright",
+        "code-coverage"
+      ],
+      "category": "quality",
+      "strict": false,
+      "commands": [
+        "./workflows/tdd-cycle.md",
+        "./tools/tdd-red.md",
+        "./tools/tdd-green.md",
+        "./tools/tdd-refactor.md",
+        "./tools/test-harness.md",
+        "./tools/ai-review.md"
+      ],
+      "agents": [
+        "./agents/tdd-orchestrator.md",
+        "./agents/test-automator.md",
+        "./agents/debugger.md",
+        "./agents/code-reviewer.md",
+        "./agents/architect-review.md"
+      ]
+    },
+    {
+      "name": "infrastructure-devops",
+      "source": "./",
+      "description": "Kubernetes manifest generation, Docker image optimization, Terraform infrastructure-as-code, configuration validation, cost analysis, and deployment checklists for container orchestration",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "kubernetes",
+        "docker",
+        "terraform",
+        "infrastructure",
+        "devops",
+        "k8s",
+        "containers",
+        "helm",
+        "argocd",
+        "gitops"
+      ],
+      "category": "infrastructure",
+      "strict": false,
+      "commands": [
+        "./tools/k8s-manifest.md",
+        "./tools/docker-optimize.md",
+        "./tools/config-validate.md",
+        "./tools/cost-optimize.md",
+        "./tools/deploy-checklist.md"
+      ],
+      "agents": [
+        "./agents/kubernetes-architect.md",
+        "./agents/terraform-specialist.md",
+        "./agents/deployment-engineer.md",
+        "./agents/cloud-architect.md"
+      ]
+    },
+    {
+      "name": "development-utilities",
+      "source": "./",
+      "description": "Code refactoring, dependency auditing, technical debt tracking, error log analysis, issue management, and standup note generation for daily development workflows",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "refactoring",
+        "dependencies",
+        "technical-debt",
+        "code-quality",
+        "error-analysis",
+        "github-issues",
+        "collaboration",
+        "maintenance"
+      ],
+      "category": "utilities",
+      "strict": false,
+      "commands": [
+        "./tools/refactor-clean.md",
+        "./tools/deps-audit.md",
+        "./tools/tech-debt.md",
+        "./tools/error-analysis.md",
+        "./tools/error-trace.md",
+        "./tools/multi-agent-review.md",
+        "./tools/issue.md",
+        "./tools/standup-notes.md",
+        "./tools/context-restore.md"
+      ],
+      "agents": [
+        "./agents/legacy-modernizer.md",
+        "./agents/code-reviewer.md",
+        "./agents/debugger.md",
+        "./agents/error-detective.md",
+        "./agents/dx-optimizer.md"
+      ]
+    },
+    {
+      "name": "security-hardening",
+      "source": "./",
+      "description": "OWASP vulnerability scanning, penetration testing workflows, security-focused code review, compliance validation for SOC2/HIPAA/GDPR, and automated security remediation",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "security",
+        "vulnerability-assessment",
+        "owasp",
+        "penetration-testing",
+        "compliance",
+        "soc2",
+        "hipaa",
+        "gdpr",
+        "xss",
+        "sql-injection",
+        "csrf",
+        "devsecops"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
@@ -78,7 +311,7 @@
     {
       "name": "data-ml-pipeline",
       "source": "./",
-      "description": "End-to-end ML/AI workflow with data engineering, feature development, model training, MLOps infrastructure, and production deployment",
+      "description": "Data pipeline construction, ML model training workflows, MLOps automation, LangChain agent development, RAG system implementation, and model deployment for machine learning projects",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -87,14 +320,29 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["machine-learning", "data-science", "mlops", "ai", "feature-engineering"],
+      "keywords": [
+        "machine-learning",
+        "data-science",
+        "mlops",
+        "ai",
+        "feature-engineering",
+        "llm",
+        "langchain",
+        "rag",
+        "vector-database",
+        "tensorflow",
+        "pytorch",
+        "mlflow"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/data-driven-feature.md",
         "./workflows/ml-pipeline.md",
         "./tools/langchain-agent.md",
-        "./tools/data-validation.md"
+        "./tools/data-validation.md",
+        "./tools/data-pipeline.md",
+        "./tools/ai-assistant.md"
       ],
       "agents": [
         "./agents/data-scientist.md",
@@ -110,7 +358,7 @@
     {
       "name": "incident-response",
       "source": "./",
-      "description": "Production incident management with rapid diagnostics, root cause analysis, emergency hotfix deployment, and post-mortem documentation",
+      "description": "Production incident diagnostics, distributed tracing analysis, root cause identification, automated rollback procedures, post-mortem documentation, and on-call playbook execution",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -119,7 +367,20 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["incident-response", "debugging", "production", "monitoring", "sre"],
+      "keywords": [
+        "incident-response",
+        "debugging",
+        "production",
+        "monitoring",
+        "sre",
+        "troubleshooting",
+        "outage",
+        "logs",
+        "kubernetes",
+        "on-call",
+        "prometheus",
+        "grafana"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
@@ -127,7 +388,10 @@
         "./workflows/smart-fix.md",
         "./tools/smart-debug.md",
         "./tools/debug-trace.md",
-        "./tools/monitor-setup.md"
+        "./tools/monitor-setup.md",
+        "./tools/slo-implement.md",
+        "./tools/error-trace.md",
+        "./tools/error-analysis.md"
       ],
       "agents": [
         "./agents/incident-responder.md",
@@ -143,7 +407,7 @@
     {
       "name": "performance-optimization",
       "source": "./",
-      "description": "System-wide performance optimization with profiling, caching strategies, query optimization, load testing, and scalability improvements",
+      "description": "Application profiling, database query optimization, caching strategy implementation, Core Web Vitals analysis, load testing, and scalability assessment for performance improvements",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -152,11 +416,24 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["performance", "optimization", "scalability", "caching", "profiling"],
+      "keywords": [
+        "performance",
+        "optimization",
+        "scalability",
+        "caching",
+        "profiling",
+        "redis",
+        "cdn",
+        "database-optimization",
+        "query-tuning",
+        "core-web-vitals",
+        "lighthouse"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
-        "./workflows/performance-optimization.md"
+        "./workflows/performance-optimization.md",
+        "./tools/cost-optimize.md"
       ],
       "agents": [
         "./agents/performance-engineer.md",
@@ -168,37 +445,10 @@
         "./agents/cloud-architect.md"
       ]
     },
-    {
-      "name": "tdd-development",
-      "source": "./",
-      "description": "Test-Driven Development workflow with red-green-refactor cycles, comprehensive test automation, and quality assurance orchestration",
-      "version": "1.0.0",
-      "author": {
-        "name": "Seth Hobson",
-        "url": "https://github.com/wshobson"
-      },
-      "homepage": "https://github.com/wshobson/agents",
-      "repository": "https://github.com/wshobson/agents",
-      "license": "MIT",
-      "keywords": ["tdd", "testing", "test-automation", "quality-assurance", "red-green-refactor"],
-      "category": "workflows",
-      "strict": false,
-      "commands": [
-        "./workflows/tdd-cycle.md",
-        "./tools/tdd-red.md",
-        "./tools/tdd-refactor.md"
-      ],
-      "agents": [
-        "./agents/tdd-orchestrator.md",
-        "./agents/test-automator.md",
-        "./agents/debugger.md",
-        "./agents/code-reviewer.md"
-      ]
-    },
     {
       "name": "code-quality-review",
       "source": "./",
-      "description": "Multi-perspective code analysis with architectural review, security audit, performance assessment, and production reliability validation",
+      "description": "Multi-agent code review analyzing architectural patterns, security vulnerabilities, performance bottlenecks, test coverage, and production reliability for comprehensive quality assessment",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -207,12 +457,24 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["code-review", "quality", "architecture", "best-practices"],
+      "keywords": [
+        "code-review",
+        "quality",
+        "architecture",
+        "best-practices",
+        "clean-code",
+        "solid",
+        "design-patterns",
+        "refactoring",
+        "maintainability"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/full-review.md",
-        "./tools/pr-enhance.md"
+        "./tools/pr-enhance.md",
+        "./tools/ai-review.md",
+        "./tools/multi-agent-review.md"
       ],
       "agents": [
         "./agents/code-reviewer.md",
@@ -222,32 +484,10 @@
         "./agents/test-automator.md"
       ]
     },
-    {
-      "name": "git-automation",
-      "source": "./",
-      "description": "Version control workflow automation with branching strategies, commit standards, PR templates, and merge conflict resolution",
-      "version": "1.0.0",
-      "author": {
-        "name": "Seth Hobson",
-        "url": "https://github.com/wshobson"
-      },
-      "homepage": "https://github.com/wshobson/agents",
-      "repository": "https://github.com/wshobson/agents",
-      "license": "MIT",
-      "keywords": ["git", "version-control", "workflow", "automation"],
-      "category": "workflows",
-      "strict": false,
-      "commands": [
-        "./workflows/git-workflow.md"
-      ],
-      "agents": [
-        "./agents/dx-optimizer.md"
-      ]
-    },
     {
       "name": "legacy-modernization",
       "source": "./",
-      "description": "Systematic legacy codebase modernization with architecture migration, dependency updates, pattern refactoring, and gradual transformation",
+      "description": "Codebase refactoring, framework migration, dependency updates, architectural transformation, and backward compatibility testing for legacy system modernization",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -256,13 +496,26 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["legacy", "modernization", "refactoring", "migration"],
+      "keywords": [
+        "legacy",
+        "modernization",
+        "refactoring",
+        "migration",
+        "technical-debt",
+        "framework-upgrade",
+        "angular",
+        "react",
+        "vue"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/legacy-modernize.md",
         "./tools/code-migrate.md",
-        "./tools/deps-upgrade.md"
+        "./tools/deps-upgrade.md",
+        "./tools/deps-audit.md",
+        "./tools/tech-debt.md",
+        "./tools/refactor-clean.md"
       ],
       "agents": [
         "./agents/legacy-modernizer.md",
@@ -274,7 +527,7 @@
     {
       "name": "multi-platform-apps",
       "source": "./",
-      "description": "Cross-platform development coordination for web, mobile (iOS/Android), and desktop applications with shared architecture",
+      "description": "Cross-platform application development coordinating web (React/Next.js), iOS (Swift/SwiftUI), Android (Kotlin), and desktop implementations with shared architecture and business logic",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -283,12 +536,22 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["cross-platform", "mobile", "web", "desktop", "react-native", "flutter"],
+      "keywords": [
+        "cross-platform",
+        "mobile",
+        "web",
+        "desktop",
+        "react-native",
+        "flutter",
+        "ios",
+        "android",
+        "swift",
+        "kotlin",
+        "electron"
+      ],
       "category": "workflows",
       "strict": false,
-      "commands": [
-        "./workflows/multi-platform.md"
-      ],
+      "commands": ["./workflows/multi-platform.md"],
       "agents": [
         "./agents/mobile-developer.md",
         "./agents/flutter-expert.md",
@@ -301,7 +564,7 @@
     {
       "name": "cicd-automation",
       "source": "./",
-      "description": "CI/CD pipeline automation with build optimization, test orchestration, deployment strategies, and monitoring integration",
+      "description": "CI/CD pipeline configuration, GitHub Actions/GitLab CI workflow setup, progressive deployment strategies, automated rollback, canary releases, and deployment monitoring",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -310,12 +573,26 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["ci-cd", "automation", "deployment", "devops", "pipeline"],
+      "keywords": [
+        "ci-cd",
+        "automation",
+        "deployment",
+        "devops",
+        "pipeline",
+        "github-actions",
+        "gitlab-ci",
+        "jenkins",
+        "argocd",
+        "gitops",
+        "canary",
+        "blue-green"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/workflow-automate.md",
-        "./tools/deploy-checklist.md"
+        "./tools/deploy-checklist.md",
+        "./tools/config-validate.md"
       ],
       "agents": [
         "./agents/deployment-engineer.md",
@@ -328,7 +605,7 @@
     {
       "name": "agent-optimization",
       "source": "./",
-      "description": "AI agent improvement workflow with prompt engineering, performance tuning, multi-agent coordination optimization, and context management",
+      "description": "AI agent prompt engineering, multi-agent workflow coordination, context window management, and performance tuning for LLM-based automation systems",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -337,14 +614,25 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["ai-agents", "prompt-engineering", "optimization", "llm"],
+      "keywords": [
+        "ai-agents",
+        "prompt-engineering",
+        "optimization",
+        "llm",
+        "claude",
+        "gpt",
+        "multi-agent",
+        "context-management"
+      ],
       "category": "workflows",
       "strict": false,
       "commands": [
         "./workflows/improve-agent.md",
         "./tools/prompt-optimize.md",
         "./tools/multi-agent-optimize.md",
-        "./tools/context-save.md"
+        "./tools/context-save.md",
+        "./tools/context-restore.md",
+        "./tools/ai-assistant.md"
       ],
       "agents": [
         "./agents/prompt-engineer.md",
@@ -355,7 +643,7 @@
     {
       "name": "documentation-generation",
       "source": "./",
-      "description": "Comprehensive technical documentation with API specs, architecture diagrams, user guides, and code explanations",
+      "description": "OpenAPI specification generation, Mermaid diagram creation, tutorial writing, API reference documentation, and technical documentation from codebases",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -364,12 +652,20 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["documentation", "api-docs", "diagrams", "technical-writing"],
-      "category": "workflows",
-      "strict": false,
-      "commands": [
-        "./tools/doc-generate.md"
+      "keywords": [
+        "documentation",
+        "api-docs",
+        "diagrams",
+        "technical-writing",
+        "openapi",
+        "swagger",
+        "mermaid",
+        "readme",
+        "docusaurus"
       ],
+      "category": "documentation",
+      "strict": false,
+      "commands": ["./tools/doc-generate.md"],
       "agents": [
         "./agents/docs-architect.md",
         "./agents/api-documenter.md",
@@ -381,7 +677,7 @@
     {
       "name": "cloud-infrastructure",
       "source": "./",
-      "description": "Cloud architecture and infrastructure specialists for AWS, Azure, GCP with Kubernetes, Terraform, and hybrid cloud capabilities",
+      "description": "Cloud architecture design for AWS/Azure/GCP, Kubernetes cluster configuration, Terraform infrastructure-as-code, hybrid cloud networking, and multi-cloud cost optimization",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -390,7 +686,20 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["cloud", "aws", "azure", "gcp", "kubernetes", "terraform", "infrastructure"],
+      "keywords": [
+        "cloud",
+        "aws",
+        "azure",
+        "gcp",
+        "kubernetes",
+        "terraform",
+        "infrastructure",
+        "eks",
+        "aks",
+        "gke",
+        "cloudformation",
+        "multi-cloud"
+      ],
       "category": "infrastructure",
       "strict": false,
       "agents": [
@@ -405,7 +714,7 @@
     {
       "name": "database-operations",
       "source": "./",
-      "description": "Database architecture, optimization, and administration specialists for SQL/NoSQL databases with performance tuning and migration support",
+      "description": "Database schema design, SQL query optimization, index analysis, data migration automation, and performance tuning for PostgreSQL, MySQL, MongoDB, and other database systems",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -414,9 +723,22 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["database", "sql", "nosql", "optimization", "migration"],
-      "category": "infrastructure",
+      "keywords": [
+        "database",
+        "sql",
+        "nosql",
+        "optimization",
+        "migration",
+        "postgres",
+        "mysql",
+        "mongodb",
+        "redis",
+        "query-optimization",
+        "indexing"
+      ],
+      "category": "database",
       "strict": false,
+      "commands": ["./tools/db-migrate.md"],
       "agents": [
         "./agents/database-architect.md",
         "./agents/database-optimizer.md",
@@ -424,43 +746,10 @@
         "./agents/sql-pro.md"
       ]
     },
-    {
-      "name": "language-specialists",
-      "source": "./",
-      "description": "Comprehensive programming language experts covering 16+ languages from systems (C/C++/Rust) to web (JS/Python/Ruby) and enterprise (Java/Scala/C#)",
-      "version": "1.0.0",
-      "author": {
-        "name": "Seth Hobson",
-        "url": "https://github.com/wshobson"
-      },
-      "homepage": "https://github.com/wshobson/agents",
-      "repository": "https://github.com/wshobson/agents",
-      "license": "MIT",
-      "keywords": ["programming-languages", "javascript", "python", "java", "rust", "golang"],
-      "category": "development",
-      "strict": false,
-      "agents": [
-        "./agents/javascript-pro.md",
-        "./agents/typescript-pro.md",
-        "./agents/python-pro.md",
-        "./agents/golang-pro.md",
-        "./agents/rust-pro.md",
-        "./agents/java-pro.md",
-        "./agents/csharp-pro.md",
-        "./agents/cpp-pro.md",
-        "./agents/c-pro.md",
-        "./agents/ruby-pro.md",
-        "./agents/php-pro.md",
-        "./agents/scala-pro.md",
-        "./agents/elixir-pro.md",
-        "./agents/django-pro.md",
-        "./agents/fastapi-pro.md"
-      ]
-    },
     {
       "name": "seo-content-suite",
       "source": "./",
-      "description": "Complete SEO optimization toolkit with 10 specialized agents for content creation, keyword strategy, meta optimization, and E-E-A-T signals",
+      "description": "SEO content analysis, keyword research, meta tag optimization, E-E-A-T signal assessment, featured snippet formatting, content freshness updates, and cannibalization detection",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -469,7 +758,17 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["seo", "content-optimization", "keywords", "meta-tags", "e-e-a-t"],
+      "keywords": [
+        "seo",
+        "content-optimization",
+        "keywords",
+        "meta-tags",
+        "e-e-a-t",
+        "search-ranking",
+        "serp",
+        "featured-snippets",
+        "schema-markup"
+      ],
       "category": "marketing",
       "strict": false,
       "agents": [
@@ -486,9 +785,9 @@
       ]
     },
     {
-      "name": "business-operations",
+      "name": "business-analytics",
       "source": "./",
-      "description": "Business analysis, HR operations, legal compliance, customer support, and sales automation for operational excellence",
+      "description": "Business metrics analysis, KPI tracking, financial reporting, and data-driven decision making for operational intelligence",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -497,22 +796,24 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["business", "hr", "legal", "compliance", "customer-support"],
+      "keywords": [
+        "business",
+        "analytics",
+        "metrics",
+        "kpi",
+        "reporting",
+        "dashboard",
+        "bi",
+        "operations"
+      ],
       "category": "business",
       "strict": false,
-      "agents": [
-        "./agents/business-analyst.md",
-        "./agents/hr-pro.md",
-        "./agents/legal-advisor.md",
-        "./agents/customer-support.md",
-        "./agents/sales-automator.md",
-        "./agents/content-marketer.md"
-      ]
+      "agents": ["./agents/business-analyst.md"]
     },
     {
-      "name": "specialized-domains",
+      "name": "hr-legal-compliance",
       "source": "./",
-      "description": "Domain specialists for blockchain/Web3, fintech/trading, payment integration, gaming, and accessibility",
+      "description": "HR policy documentation, legal compliance templates (GDPR/SOC2/HIPAA), employment contracts, and regulatory documentation",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -521,26 +822,25 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["blockchain", "web3", "fintech", "payments", "gaming", "accessibility"],
-      "category": "specialized",
-      "strict": false,
-      "commands": [
-        "./tools/accessibility-audit.md"
+      "keywords": [
+        "hr",
+        "legal",
+        "compliance",
+        "gdpr",
+        "soc2",
+        "hipaa",
+        "policies",
+        "employment",
+        "contracts"
       ],
-      "agents": [
-        "./agents/blockchain-developer.md",
-        "./agents/quant-analyst.md",
-        "./agents/risk-manager.md",
-        "./agents/payment-integration.md",
-        "./agents/minecraft-bukkit-pro.md",
-        "./agents/unity-developer.md",
-        "./agents/ui-visual-validator.md"
-      ]
+      "category": "business",
+      "strict": false,
+      "agents": ["./agents/hr-pro.md", "./agents/legal-advisor.md"]
     },
     {
-      "name": "research-utilities",
+      "name": "customer-sales-automation",
       "source": "./",
-      "description": "Essential utility agents for advanced research, developer experience optimization, and context management",
+      "description": "Customer support workflow automation, sales pipeline management, email campaigns, and CRM integration for customer relationship workflows",
       "version": "1.0.0",
       "author": {
         "name": "Seth Hobson",
@@ -549,14 +849,153 @@
       "homepage": "https://github.com/wshobson/agents",
       "repository": "https://github.com/wshobson/agents",
       "license": "MIT",
-      "keywords": ["research", "utilities", "developer-experience", "tools"],
-      "category": "utilities",
+      "keywords": [
+        "customer-support",
+        "sales",
+        "crm",
+        "email-campaigns",
+        "automation",
+        "outreach",
+        "customer-service"
+      ],
+      "category": "business",
+      "strict": false,
+      "agents": ["./agents/customer-support.md", "./agents/sales-automator.md"]
+    },
+    {
+      "name": "blockchain-web3",
+      "source": "./",
+      "description": "Smart contract development with Solidity, DeFi protocol implementation, NFT platforms, and Web3 application architecture",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "blockchain",
+        "web3",
+        "solidity",
+        "ethereum",
+        "defi",
+        "nft",
+        "smart-contracts",
+        "dapp",
+        "crypto"
+      ],
+      "category": "blockchain",
+      "strict": false,
+      "agents": ["./agents/blockchain-developer.md"]
+    },
+    {
+      "name": "quantitative-trading",
+      "source": "./",
+      "description": "Quantitative analysis, algorithmic trading strategies, financial modeling, portfolio risk management, and backtesting frameworks",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "fintech",
+        "quant",
+        "trading",
+        "algorithmic-trading",
+        "financial-modeling",
+        "risk-management",
+        "portfolio",
+        "backtesting"
+      ],
+      "category": "finance",
+      "strict": false,
+      "agents": ["./agents/quant-analyst.md", "./agents/risk-manager.md"]
+    },
+    {
+      "name": "payment-processing",
+      "source": "./",
+      "description": "Payment gateway integration with Stripe, PayPal, and other processors, checkout flow implementation, subscription billing, and PCI compliance",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "payments",
+        "stripe",
+        "paypal",
+        "checkout",
+        "billing",
+        "subscriptions",
+        "pci",
+        "e-commerce"
+      ],
+      "category": "payments",
+      "strict": false,
+      "agents": ["./agents/payment-integration.md"]
+    },
+    {
+      "name": "game-development",
+      "source": "./",
+      "description": "Unity game development with C# scripting, Minecraft server plugin development with Bukkit/Spigot APIs, and game mechanics implementation",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "gaming",
+        "unity",
+        "minecraft",
+        "game-dev",
+        "bukkit",
+        "spigot",
+        "csharp",
+        "game-mechanics"
+      ],
+      "category": "gaming",
       "strict": false,
       "agents": [
-        "./agents/search-specialist.md",
-        "./agents/dx-optimizer.md",
-        "./agents/context-manager.md"
+        "./agents/unity-developer.md",
+        "./agents/minecraft-bukkit-pro.md"
       ]
+    },
+    {
+      "name": "accessibility-compliance",
+      "source": "./",
+      "description": "WCAG accessibility auditing, compliance validation, UI testing for screen readers, keyboard navigation, and inclusive design implementation",
+      "version": "1.0.0",
+      "author": {
+        "name": "Seth Hobson",
+        "url": "https://github.com/wshobson"
+      },
+      "homepage": "https://github.com/wshobson/agents",
+      "repository": "https://github.com/wshobson/agents",
+      "license": "MIT",
+      "keywords": [
+        "accessibility",
+        "wcag",
+        "a11y",
+        "compliance",
+        "inclusive-design",
+        "screen-reader",
+        "keyboard-navigation",
+        "aria"
+      ],
+      "category": "accessibility",
+      "strict": false,
+      "commands": ["./tools/accessibility-audit.md"],
+      "agents": ["./agents/ui-visual-validator.md"]
     }
   ]
 }
diff --git a/README.md b/README.md
index eb240c5..d157b57 100644
--- a/README.md
+++ b/README.md
@@ -12,28 +12,194 @@ This unified repository provides everything needed for intelligent automation an
 
 ## Installation
 
-### Plugin Marketplace (Recommended - Available October 9, 2025)
-
-Install workflow-based plugin collections directly from the Claude Code plugin marketplace:
+### Quick Start
 
 ```bash
-# Add the marketplace
+# Add the plugin marketplace
 /plugin marketplace add wshobson/agents
 
 # Browse available plugins
 /plugin list
 
-# Install workflow-based plugins
-/plugin install full-stack-development
-/plugin install security-hardening
-/plugin install data-ml-pipeline
-/plugin install incident-response
+# Install your first plugin
+/plugin install claude-code-essentials
+```
 
-# Install infrastructure/specialist plugins
+### Available Plugins
+
+#### Getting Started
+
+**claude-code-essentials** - Essential tools for daily development
+```bash
+/plugin install claude-code-essentials
+```
+Includes: Code explanation, debugging, documentation, PR enhancement, git workflows
+
+#### Complete Workflow Systems
+
+**full-stack-development** - End-to-end feature implementation
+```bash
+/plugin install full-stack-development
+```
+Multi-agent coordination: Backend API → Frontend UI → Mobile → Testing → Security → Deployment
+
+**security-hardening** - Security auditing and compliance
+```bash
+/plugin install security-hardening
+```
+OWASP scanning, penetration testing, code review, SOC2/HIPAA/GDPR compliance
+
+**data-ml-pipeline** - ML/AI development and MLOps
+```bash
+/plugin install data-ml-pipeline
+```
+Data engineering → Model training → MLOps → LangChain/RAG → Deployment
+
+**incident-response** - Production debugging and SRE
+```bash
+/plugin install incident-response
+```
+Diagnostics → Root cause analysis → Rollback → Post-mortem documentation
+
+**performance-optimization** - System profiling and optimization
+```bash
+/plugin install performance-optimization
+```
+Profiling → Query optimization → Caching → Scalability assessment
+
+**code-quality-review** - Multi-perspective code analysis
+```bash
+/plugin install code-quality-review
+```
+Architecture → Security → Performance → Test coverage analysis
+
+**legacy-modernization** - Codebase modernization workflows
+```bash
+/plugin install legacy-modernization
+```
+Framework migration → Dependency updates → Refactoring → Compatibility testing
+
+**multi-platform-apps** - Cross-platform development
+```bash
+/plugin install multi-platform-apps
+```
+Web (React/Next.js) → iOS (Swift) → Android (Kotlin) → Desktop coordination
+
+**cicd-automation** - CI/CD pipeline configuration
+```bash
+/plugin install cicd-automation
+```
+GitHub Actions/GitLab CI → Progressive deployment → Canary releases → Monitoring
+
+**agent-optimization** - AI agent performance tuning
+```bash
+/plugin install agent-optimization
+```
+Prompt engineering → Multi-agent coordination → Context management
+
+**documentation-generation** - Technical documentation automation
+```bash
+/plugin install documentation-generation
+```
+OpenAPI specs → Mermaid diagrams → Tutorials → API references
+
+#### Focused Development Kits
+
+**api-development-kit** - REST/GraphQL API development
+```bash
+/plugin install api-development-kit
+```
+API scaffolding → OpenAPI docs → Security scanning → Mocking → Validation
+
+**testing-quality-suite** - Comprehensive testing workflows
+```bash
+/plugin install testing-quality-suite
+```
+TDD workflows → Test generation → Unit/integration/e2e → Quality gates
+
+**infrastructure-devops** - Container orchestration deployment
+```bash
+/plugin install infrastructure-devops
+```
+Kubernetes manifests → Docker optimization → Terraform IaC → Cost analysis
+
+**development-utilities** - Daily productivity tools
+```bash
+/plugin install development-utilities
+```
+Refactoring → Dependency auditing → Error analysis → Standup automation
+
+#### Infrastructure & Operations
+
+**cloud-infrastructure** - AWS/Azure/GCP architecture
+```bash
 /plugin install cloud-infrastructure
-/plugin install language-specialists
+```
+Cloud design → Kubernetes → Terraform IaC → Hybrid cloud → Cost optimization
+
+**database-operations** - Database optimization and administration
+```bash
+/plugin install database-operations
+```
+Schema design → Query optimization → Migrations → PostgreSQL/MySQL/MongoDB
+
+#### Marketing & Business
+
+**seo-content-suite** - SEO optimization toolkit
+```bash
 /plugin install seo-content-suite
 ```
+Content analysis → Keyword research → Meta optimization → E-E-A-T signals
+
+**business-analytics** - Business intelligence and metrics
+```bash
+/plugin install business-analytics
+```
+KPI tracking → Financial reporting → Data-driven decision making
+
+**hr-legal-compliance** - HR and legal documentation
+```bash
+/plugin install hr-legal-compliance
+```
+HR policies → Legal templates → GDPR/SOC2/HIPAA compliance → Employment contracts
+
+**customer-sales-automation** - Customer relationship workflows
+```bash
+/plugin install customer-sales-automation
+```
+Support automation → Sales pipeline → Email campaigns → CRM integration
+
+#### Specialized Domains
+
+**blockchain-web3** - Blockchain and smart contract development
+```bash
+/plugin install blockchain-web3
+```
+Solidity → Smart contracts → DeFi protocols → NFT platforms → Web3 apps
+
+**quantitative-trading** - Financial modeling and algorithmic trading
+```bash
+/plugin install quantitative-trading
+```
+Quant analysis → Trading strategies → Portfolio risk → Backtesting
+
+**payment-processing** - Payment gateway integration
+```bash
+/plugin install payment-processing
+```
+Stripe/PayPal integration → Checkout flows → Subscription billing → PCI compliance
+
+**game-development** - Unity and Minecraft development
+```bash
+/plugin install game-development
+```
+Unity C# scripting → Minecraft Bukkit/Spigot plugins → Game mechanics
+
+**accessibility-compliance** - WCAG accessibility auditing
+```bash
+/plugin install accessibility-compliance
+```
+WCAG validation → Screen reader testing → Keyboard navigation → Inclusive design
 
 ### Manual Installation
 
@@ -64,6 +230,48 @@ agents/
 └── README.md
 ```
 
+## Usage
+
+### Agent Invocation
+
+After installing plugins, agents are automatically available. Invoke them explicitly in natural language:
+
+```
+"Use backend-architect to design the authentication API"
+"Have security-auditor scan for OWASP vulnerabilities"
+"Get performance-engineer to optimize this database query"
+```
+
+Claude Code automatically selects and coordinates the appropriate agents based on your request.
+
+### Multi-Agent Orchestration Examples
+
+Plugins provide pre-configured multi-agent workflows that coordinate complex operations:
+
+**Full-Stack Development Plugin**
+```
+"Implement user dashboard with real-time analytics"
+```
+→ backend-architect → graphql-architect → frontend-developer → mobile-developer → test-automator → security-auditor → performance-engineer → deployment-engineer
+
+**Security Hardening Plugin**
+```
+"Perform security audit and implement OWASP best practices"
+```
+→ security-auditor → backend-security-coder → frontend-security-coder → mobile-security-coder → test-automator
+
+**Data/ML Pipeline Plugin**
+```
+"Build customer churn prediction model with deployment"
+```
+→ data-scientist → data-engineer → ml-engineer → mlops-engineer → ai-engineer → performance-engineer
+
+**Incident Response Plugin**
+```
+"Debug production memory leak and create runbook"
+```
+→ incident-responder → devops-troubleshooter → debugger → error-detective → observability-engineer
+
 ## Agent Categories
 
 ### Architecture & System Design
@@ -301,176 +509,6 @@ Agents are assigned to specific Claude models based on task complexity and compu
 | AI/ML Complex | 5 | `ai-engineer`, `ml-engineer`, `mlops-engineer`, `data-scientist`, `prompt-engineer` |
 | Business Critical | 4 | `docs-architect`, `hr-pro`, `legal-advisor`, `quant-analyst` |
 
-## Usage
-
-### Workflow Invocation
-
-```bash
-# Full-stack feature development
-/workflows:feature-development implement OAuth2 authentication
-
-# Security hardening
-/workflows:security-hardening perform security audit and remediation
-
-# ML pipeline
-/workflows:ml-pipeline build recommendation system with monitoring
-
-# Incident response
-/workflows:incident-response debug production memory leak
-```
-
-### Tool Invocation
-
-```bash
-# API scaffolding
-/tools:api-scaffold create user management endpoints
-
-# Security scanning
-/tools:security-scan perform vulnerability assessment
-
-# Documentation generation
-/tools:doc-generate create API documentation
-```
-
-### Direct Agent Access
-
-Agents are automatically available and can be explicitly invoked:
-
-```bash
-"Use backend-architect to design the authentication API"
-"Have security-auditor scan for OWASP vulnerabilities"
-"Get performance-engineer to optimize this bottleneck"
-```
-
-## Multi-Agent Orchestration Examples
-
-### Full-Stack Development
-```bash
-/workflows:full-stack-feature implement user dashboard with analytics
-```
-**Orchestrates**: backend-architect → graphql-architect → frontend-developer → mobile-developer → test-automator → security-auditor → performance-engineer → deployment-engineer
-
-### Security Hardening
-```bash
-/workflows:security-hardening implement security best practices
-```
-**Orchestrates**: security-auditor → backend-security-coder → frontend-security-coder → mobile-security-coder → test-automator
-
-### Data/ML Pipeline
-```bash
-/workflows:ml-pipeline build customer churn prediction model
-```
-**Orchestrates**: data-scientist → data-engineer → ml-engineer → mlops-engineer → ai-engineer → performance-engineer
-
-### Incident Response
-```bash
-/workflows:incident-response debug high CPU usage in production
-```
-**Orchestrates**: incident-responder → devops-troubleshooter → debugger → error-detective → observability-engineer
-
-### Common Workflow Patterns
-
-**Feature Development**
-```
-"Implement user authentication"
-→ backend-architect → frontend-developer → test-automator → security-auditor
-```
-
-**Performance Optimization**
-```
-"Optimize checkout process"
-→ performance-engineer → database-optimizer → frontend-developer
-```
-
-**Production Incidents**
-```
-"Debug high memory usage"
-→ incident-responder → devops-troubleshooter → error-detective → performance-engineer
-```
-
-**Infrastructure Setup**
-```
-"Set up disaster recovery"
-→ database-admin → database-optimizer → terraform-specialist
-```
-
-**ML Pipeline Development**
-```
-"Build ML pipeline with monitoring"
-→ mlops-engineer → ml-engineer → data-engineer → performance-engineer
-```
-
-## Workflow Commands
-
-Multi-agent orchestration systems that coordinate complex, cross-domain tasks:
-
-### Core Development Workflows
-
-| Command | Purpose | Agent Coordination |
-|---------|---------|-------------------|
-| `feature-development` | End-to-end feature implementation | Backend, frontend, testing, deployment |
-| `full-stack-feature` | Complete multi-tier implementation | Backend API, frontend UI, mobile, database |
-| `full-review` | Multi-perspective code analysis | Architecture, security, performance, quality |
-| `smart-fix` | Intelligent problem resolution | Dynamic agent selection based on issue type |
-| `tdd-cycle` | Test-driven development orchestration | Test writer, implementer, refactoring specialist |
-
-### Process Automation Workflows
-
-| Command | Purpose | Scope |
-|---------|---------|-------|
-| `git-workflow` | Version control process automation | Branching strategies, commit standards, PR templates |
-| `improve-agent` | Agent optimization | Prompt engineering, performance tuning |
-| `legacy-modernize` | Codebase modernization | Architecture migration, dependency updates |
-| `multi-platform` | Cross-platform development | Web, mobile, desktop coordination |
-| `workflow-automate` | CI/CD pipeline automation | Build, test, deploy, monitor |
-
-### Advanced Orchestration Workflows
-
-| Command | Primary Focus | Specialized Agents |
-|---------|---------------|-------------------|
-| `security-hardening` | Security-first development | Threat modeling, vulnerability assessment |
-| `data-driven-feature` | ML-powered functionality | Data science, feature engineering, model deployment |
-| `ml-pipeline` | End-to-end ML infrastructure | MLOps, data engineering, model serving |
-| `performance-optimization` | System-wide optimization | Profiling, caching, query optimization |
-| `incident-response` | Production issue resolution | Diagnostics, root cause analysis, hotfix deployment |
-
-## Development Tools
-
-Focused, single-purpose utilities for specific development operations:
-
-### AI and Machine Learning
-- `langchain-agent` - LangChain agent development
-- `ai-assistant` - AI-powered development assistance
-- `ai-review` - AI-based code review
-
-### API Development
-- `api-scaffold` - API endpoint scaffolding
-- `api-mock` - API mocking and testing
-
-### Testing & Quality
-- `tdd-red` - Red phase (failing tests)
-- `tdd-green` - Green phase (passing implementation)
-- `tdd-refactor` - Refactor phase
-- `test-harness` - Test infrastructure setup
-
-### Security & Compliance
-- `security-scan` - Vulnerability scanning
-- `compliance-check` - Compliance validation
-
-### Infrastructure & Operations
-- `k8s-manifest` - Kubernetes manifest generation
-- `docker-optimize` - Docker optimization
-- `monitor-setup` - Monitoring infrastructure
-- `deploy-checklist` - Deployment validation
-
-### Code Quality
-- `code-explain` - Code explanation
-- `code-migrate` - Code migration
-- `refactor-clean` - Code refactoring
-- `pr-enhance` - Pull request enhancement
-
-### And 20+ more tools for debugging, documentation, data validation, cost optimization, and developer workflows
-
 ## Contributing
 
 To add new agents, workflows, or tools:
diff --git a/tools/accessibility-audit.md b/tools/accessibility-audit.md
index a1b088b..c29ba24 100644
--- a/tools/accessibility-audit.md
+++ b/tools/accessibility-audit.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Accessibility Audit and Testing
diff --git a/tools/ai-assistant.md b/tools/ai-assistant.md
index abdc631..3357cb2 100644
--- a/tools/ai-assistant.md
+++ b/tools/ai-assistant.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # AI Assistant Development
diff --git a/tools/ai-review.md b/tools/ai-review.md
index 00b96d4..6d5558a 100644
--- a/tools/ai-review.md
+++ b/tools/ai-review.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # AI/ML Code Review
diff --git a/tools/api-mock.md b/tools/api-mock.md
index d469020..f540a0f 100644
--- a/tools/api-mock.md
+++ b/tools/api-mock.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # API Mocking Framework
diff --git a/tools/api-scaffold.md b/tools/api-scaffold.md
index e3e419e..b0e6f17 100644
--- a/tools/api-scaffold.md
+++ b/tools/api-scaffold.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # API Scaffold Generator
diff --git a/tools/code-explain.md b/tools/code-explain.md
index 5af64dd..4dddee5 100644
--- a/tools/code-explain.md
+++ b/tools/code-explain.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Code Explanation and Analysis
diff --git a/tools/code-migrate.md b/tools/code-migrate.md
index 0f80bb5..9be22f4 100644
--- a/tools/code-migrate.md
+++ b/tools/code-migrate.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Code Migration Assistant
diff --git a/tools/compliance-check.md b/tools/compliance-check.md
index 836106d..90c5ae3 100644
--- a/tools/compliance-check.md
+++ b/tools/compliance-check.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Regulatory Compliance Check
diff --git a/tools/config-validate.md b/tools/config-validate.md
index 92869b1..3d81f60 100644
--- a/tools/config-validate.md
+++ b/tools/config-validate.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Configuration Validation
diff --git a/tools/context-restore.md b/tools/context-restore.md
index 47b25ab..4019a26 100644
--- a/tools/context-restore.md
+++ b/tools/context-restore.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Restore saved project context for agent coordination:
diff --git a/tools/context-save.md b/tools/context-save.md
index 97cb4a2..59f2f4a 100644
--- a/tools/context-save.md
+++ b/tools/context-save.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Save current project context for future agent coordination:
diff --git a/tools/cost-optimize.md b/tools/cost-optimize.md
index ed14be0..ca06560 100644
--- a/tools/cost-optimize.md
+++ b/tools/cost-optimize.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Cloud Cost Optimization
diff --git a/tools/data-pipeline.md b/tools/data-pipeline.md
index 2377591..4674285 100644
--- a/tools/data-pipeline.md
+++ b/tools/data-pipeline.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Data Pipeline Architecture
diff --git a/tools/data-validation.md b/tools/data-validation.md
index f90691d..750f535 100644
--- a/tools/data-validation.md
+++ b/tools/data-validation.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Data Validation Pipeline
diff --git a/tools/db-migrate.md b/tools/db-migrate.md
index 5e68fe5..81c208c 100644
--- a/tools/db-migrate.md
+++ b/tools/db-migrate.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Database Migration Strategy and Implementation
diff --git a/tools/debug-trace.md b/tools/debug-trace.md
index 2fb67df..302c285 100644
--- a/tools/debug-trace.md
+++ b/tools/debug-trace.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Debug and Trace Configuration
diff --git a/tools/deploy-checklist.md b/tools/deploy-checklist.md
index 50e450b..61ee9ad 100644
--- a/tools/deploy-checklist.md
+++ b/tools/deploy-checklist.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Deployment Checklist and Configuration
diff --git a/tools/deps-audit.md b/tools/deps-audit.md
index 68adf6f..273363c 100644
--- a/tools/deps-audit.md
+++ b/tools/deps-audit.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Dependency Audit and Security Analysis
diff --git a/tools/deps-upgrade.md b/tools/deps-upgrade.md
index 3f17d16..2254599 100644
--- a/tools/deps-upgrade.md
+++ b/tools/deps-upgrade.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Dependency Upgrade Strategy
diff --git a/tools/doc-generate.md b/tools/doc-generate.md
index 52f1f96..09c5078 100644
--- a/tools/doc-generate.md
+++ b/tools/doc-generate.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Automated Documentation Generation
diff --git a/tools/docker-optimize.md b/tools/docker-optimize.md
index e5ec6ec..5a7eadf 100644
--- a/tools/docker-optimize.md
+++ b/tools/docker-optimize.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Docker Optimization
diff --git a/tools/error-analysis.md b/tools/error-analysis.md
index 09c825c..7ac49d6 100644
--- a/tools/error-analysis.md
+++ b/tools/error-analysis.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Error Analysis and Resolution
diff --git a/tools/error-trace.md b/tools/error-trace.md
index b0905c4..a6ae800 100644
--- a/tools/error-trace.md
+++ b/tools/error-trace.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Error Tracking and Monitoring
diff --git a/tools/issue.md b/tools/issue.md
index 6638026..a2b5f01 100644
--- a/tools/issue.md
+++ b/tools/issue.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Please analyze and fix the GitHub issue: $ARGUMENTS.
diff --git a/tools/k8s-manifest.md b/tools/k8s-manifest.md
index 0b49612..677a2db 100644
--- a/tools/k8s-manifest.md
+++ b/tools/k8s-manifest.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Kubernetes Manifest Generation
diff --git a/tools/langchain-agent.md b/tools/langchain-agent.md
index 5223e94..fe45c97 100644
--- a/tools/langchain-agent.md
+++ b/tools/langchain-agent.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # LangChain/LangGraph Agent Scaffold
diff --git a/tools/monitor-setup.md b/tools/monitor-setup.md
index 7bd0a4c..771afc4 100644
--- a/tools/monitor-setup.md
+++ b/tools/monitor-setup.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Monitoring and Observability Setup
diff --git a/tools/multi-agent-optimize.md b/tools/multi-agent-optimize.md
index 9704986..5499c33 100644
--- a/tools/multi-agent-optimize.md
+++ b/tools/multi-agent-optimize.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Optimize application stack using specialized optimization agents:
diff --git a/tools/multi-agent-review.md b/tools/multi-agent-review.md
index 849685b..2f59a86 100644
--- a/tools/multi-agent-review.md
+++ b/tools/multi-agent-review.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Perform comprehensive multi-agent code review with specialized reviewers:
diff --git a/tools/onboard.md b/tools/onboard.md
index e0a53b4..a40371d 100644
--- a/tools/onboard.md
+++ b/tools/onboard.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Onboard
diff --git a/tools/pr-enhance.md b/tools/pr-enhance.md
index 713f955..3e2eef6 100644
--- a/tools/pr-enhance.md
+++ b/tools/pr-enhance.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Pull Request Enhancement
diff --git a/tools/prompt-optimize.md b/tools/prompt-optimize.md
index ce4148f..e2d7f39 100644
--- a/tools/prompt-optimize.md
+++ b/tools/prompt-optimize.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # AI Prompt Optimization
diff --git a/tools/refactor-clean.md b/tools/refactor-clean.md
index b66fbd8..2be5e73 100644
--- a/tools/refactor-clean.md
+++ b/tools/refactor-clean.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Refactor and Clean Code
diff --git a/tools/security-scan.md b/tools/security-scan.md
index 71f59c4..ef8ec3a 100644
--- a/tools/security-scan.md
+++ b/tools/security-scan.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Security Scan and Vulnerability Assessment
diff --git a/tools/slo-implement.md b/tools/slo-implement.md
index 39c870c..7f752b8 100644
--- a/tools/slo-implement.md
+++ b/tools/slo-implement.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # SLO Implementation Guide
diff --git a/tools/smart-debug.md b/tools/smart-debug.md
index a507d0d..f849dd4 100644
--- a/tools/smart-debug.md
+++ b/tools/smart-debug.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Debug complex issues using specialized debugging agents:
diff --git a/tools/standup-notes.md b/tools/standup-notes.md
index f7ee031..a4fa8fa 100644
--- a/tools/standup-notes.md
+++ b/tools/standup-notes.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Standup Notes Generator
diff --git a/tools/tdd-green.md b/tools/tdd-green.md
index d36c60a..1204aee 100644
--- a/tools/tdd-green.md
+++ b/tools/tdd-green.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Implement minimal code to make failing tests pass in TDD green phase:
diff --git a/tools/tdd-red.md b/tools/tdd-red.md
index ecd0557..b576f24 100644
--- a/tools/tdd-red.md
+++ b/tools/tdd-red.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 Write comprehensive failing tests following TDD red phase principles:
diff --git a/tools/tdd-refactor.md b/tools/tdd-refactor.md
index 76aaa9b..b29b699 100644
--- a/tools/tdd-refactor.md
+++ b/tools/tdd-refactor.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Refactor code with confidence using comprehensive test safety net:
diff --git a/tools/tech-debt.md b/tools/tech-debt.md
index 2718b29..d289333 100644
--- a/tools/tech-debt.md
+++ b/tools/tech-debt.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Technical Debt Analysis and Remediation
diff --git a/tools/test-harness.md b/tools/test-harness.md
index e71a316..2580a2f 100644
--- a/tools/test-harness.md
+++ b/tools/test-harness.md
@@ -1,5 +1,5 @@
 ---
-model: claude-sonnet-4-0
+model: sonnet
 ---
 
 # Comprehensive Test Harness Generator
diff --git a/workflows/data-driven-feature.md b/workflows/data-driven-feature.md
index 6256e1c..9bc7f07 100644
--- a/workflows/data-driven-feature.md
+++ b/workflows/data-driven-feature.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Build data-driven features with integrated pipelines and ML capabilities using specialized agents:
diff --git a/workflows/feature-development.md b/workflows/feature-development.md
index d13ed0d..8580939 100644
--- a/workflows/feature-development.md
+++ b/workflows/feature-development.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Implement a new feature using specialized agents with explicit Task tool invocations:
diff --git a/workflows/full-review.md b/workflows/full-review.md
index 22128f7..b5df74c 100644
--- a/workflows/full-review.md
+++ b/workflows/full-review.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Perform a comprehensive review using multiple specialized agents with explicit Task tool invocations:
diff --git a/workflows/full-stack-feature.md b/workflows/full-stack-feature.md
index 22cfa7d..f480ef3 100644
--- a/workflows/full-stack-feature.md
+++ b/workflows/full-stack-feature.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Implement a full-stack feature across multiple platforms with coordinated agent orchestration:
diff --git a/workflows/git-workflow.md b/workflows/git-workflow.md
index 0da2b0f..e96974e 100644
--- a/workflows/git-workflow.md
+++ b/workflows/git-workflow.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Complete Git workflow using specialized agents:
diff --git a/workflows/improve-agent.md b/workflows/improve-agent.md
index 958c980..cab0ba5 100644
--- a/workflows/improve-agent.md
+++ b/workflows/improve-agent.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Improve an existing agent based on recent performance:
diff --git a/workflows/incident-response.md b/workflows/incident-response.md
index 5311dee..63c0c74 100644
--- a/workflows/incident-response.md
+++ b/workflows/incident-response.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Respond to production incidents with coordinated agent expertise for rapid resolution:
diff --git a/workflows/legacy-modernize.md b/workflows/legacy-modernize.md
index 8e00d6a..96bf7a3 100644
--- a/workflows/legacy-modernize.md
+++ b/workflows/legacy-modernize.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Modernize legacy code using expert agents:
diff --git a/workflows/ml-pipeline.md b/workflows/ml-pipeline.md
index 5612732..68b234b 100644
--- a/workflows/ml-pipeline.md
+++ b/workflows/ml-pipeline.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 # Machine Learning Pipeline
diff --git a/workflows/multi-platform.md b/workflows/multi-platform.md
index e404e21..96e6ca0 100644
--- a/workflows/multi-platform.md
+++ b/workflows/multi-platform.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Build the same feature across multiple platforms:
diff --git a/workflows/performance-optimization.md b/workflows/performance-optimization.md
index 5ece6dc..5c1c709 100644
--- a/workflows/performance-optimization.md
+++ b/workflows/performance-optimization.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Optimize application performance end-to-end using specialized performance and optimization agents:
diff --git a/workflows/security-hardening.md b/workflows/security-hardening.md
index bb0cfe1..12d3256 100644
--- a/workflows/security-hardening.md
+++ b/workflows/security-hardening.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Implement security-first architecture and hardening measures with coordinated agent orchestration:
diff --git a/workflows/smart-fix.md b/workflows/smart-fix.md
index 3f36a60..463a5af 100644
--- a/workflows/smart-fix.md
+++ b/workflows/smart-fix.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Intelligently fix the issue using automatic agent selection with explicit Task tool invocations:
diff --git a/workflows/tdd-cycle.md b/workflows/tdd-cycle.md
index 5102cd6..be85861 100644
--- a/workflows/tdd-cycle.md
+++ b/workflows/tdd-cycle.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 Execute a comprehensive Test-Driven Development (TDD) workflow with strict red-green-refactor discipline:
diff --git a/workflows/workflow-automate.md b/workflows/workflow-automate.md
index 234c32b..8af8862 100644
--- a/workflows/workflow-automate.md
+++ b/workflows/workflow-automate.md
@@ -1,5 +1,5 @@
 ---
-model: claude-opus-4-1
+model: sonnet
 ---
 
 # Workflow Automation