feat: add architecture diagram skill

.claude-plugin/marketplace.json

@@ -106,7 +106,7 @@
     },
     {
       "category": "deployment",
-      "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment.",
+      "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment. Generate validated AWS architecture diagrams as draw.io XML.",
       "keywords": [
         "aws",
         "aws agent skills",
@@ -115,12 +115,15 @@
         "cdk",
         "cloudformation",
         "infrastructure",
-        "pricing"
+        "pricing",
+        "diagrams",
+        "draw.io",
+        "architecture"
       ],
       "name": "deploy-on-aws",
       "source": "./plugins/deploy-on-aws",
-      "tags": ["aws", "deploy", "infrastructure", "cdk"],
-      "version": "1.1.0"
+      "tags": ["aws", "deploy", "infrastructure", "cdk", "diagrams"],
+      "version": "1.2.0"
     },
     {
       "category": "migration",

plugins/deploy-on-aws/.claude-plugin/plugin.json

@@ -2,18 +2,21 @@
   "author": {
     "name": "Amazon Web Services"
   },
-  "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment.",
+  "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment. Generate validated AWS architecture diagrams as draw.io XML.",
   "homepage": "https://github.com/awslabs/agent-plugins",
   "keywords": [
     "aws",
     "deploy",
     "infrastructure",
     "cdk",
     "cloudformation",
-    "pricing"
+    "pricing",
+    "diagrams",
+    "draw.io",
+    "architecture"
   ],
   "license": "Apache-2.0",
   "name": "deploy-on-aws",
   "repository": "https://github.com/awslabs/agent-plugins",
-  "version": "1.1.0"
+  "version": "1.2.0"
 }

plugins/deploy-on-aws/.codex-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "deploy-on-aws",
-  "version": "1.1.0",
-  "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment.",
+  "version": "1.2.0",
+  "description": "Deploy applications to AWS with architecture recommendations, cost estimates, and IaC deployment. Generate validated AWS architecture diagrams as draw.io XML.",
   "author": {
     "name": "Amazon Web Services",
     "email": "aws-agent-plugins@amazon.com",
@@ -16,7 +16,10 @@
     "infrastructure",
     "cdk",
     "cloudformation",
-    "pricing"
+    "pricing",
+    "diagrams",
+    "draw.io",
+    "architecture"
   ],
   "skills": "./skills/",
   "mcpServers": "./.mcp.json",

plugins/deploy-on-aws/README.md

@@ -0,0 +1,57 @@
+# Deploy on AWS Plugin
+
+Deploy applications to AWS with architecture recommendations, cost estimates, IaC deployment, and validated architecture diagrams.
+
+## Overview
+
+This plugin provides two skills: infrastructure deployment with cost estimation, and AWS architecture diagram generation as draw.io XML with official AWS4 icons.
+
+## Skills
+
+| Skill                      | Description                                                                                           |
+| -------------------------- | ----------------------------------------------------------------------------------------------------- |
+| `deploy`                   | Analyze codebases, recommend AWS services, estimate costs, and generate CDK/CloudFormation IaC        |
+| `aws-architecture-diagram` | Generate validated draw.io architecture diagrams with AWS4 icons, step legends, and dark mode support |
+
+## MCP Servers
+
+| Server         | Description                                       |
+| -------------- | ------------------------------------------------- |
+| `awsiac`       | AWS IaC best practices and patterns               |
+| `awsknowledge` | Architecture guidance and service recommendations |
+| `awspricing`   | Real-time AWS pricing data for cost estimation    |
+
+## Installation
+
+```bash
+/plugin marketplace add awslabs/agent-plugins
+/plugin install deploy-on-aws@agent-plugins-for-aws
+```
+
+## Prerequisites
+
+- Python 3.9+
+- `defusedxml` — required for diagram XML validation: `pip3 install defusedxml>=0.7.1`
+- AWS CLI with configured credentials (for deployment skills)
+- [draw.io desktop](https://www.drawio.com/) (optional, for PNG/SVG/PDF export)
+
+## Examples
+
+- "Deploy my app to AWS"
+- "Estimate AWS costs for this project"
+- "Generate an architecture diagram for a serverless REST API"
+- "Create a sketch-mode diagram of my IoT pipeline"
+- "Analyze my codebase and generate an architecture diagram"
+
+## Files
+
+- `skills/deploy/SKILL.md` — Infrastructure deployment workflow
+- `skills/aws-architecture-diagram/SKILL.md` — Diagram generation skill
+- `skills/aws-architecture-diagram/references/` — Style guides, templates, and example diagrams
+- `scripts/validate-drawio.sh` — PostToolUse hook for diagram validation
+- `scripts/lib/` — Post-processing pipeline (icon colors, badge placement, legend sizing)
+- `scripts/requirements.txt` — Python dependencies
+
+## License
+
+Apache-2.0

plugins/deploy-on-aws/hooks/hooks.json

@@ -0,0 +1,16 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Edit|Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/validate-drawio.sh",
+            "timeout": 30
+          }
+        ]
+      }
+    ]
+  }
+}