Update azure-architecture-autopilot: 19 new service types (72 total) (#1175)

* Update azure-architecture-autopilot: 19 new service types (72 total) + advisor improvements

- Added service types: apim, service_bus, logic_apps, event_grid, container_apps, postgresql, mysql, load_balancer, nat_gateway, expressroute, sentinel, data_explorer, signalr, notification_hub, spring_apps, static_web_app, digital_twins, backup
- Updated phase1-advisor prompt with improved guidance
- Synced icons.py updates

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: regenerate README docs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: whoniiii <whoniiii@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: whoniiii

skills/azure-architecture-autopilot/references/phase1-advisor.md

@@ -432,20 +432,63 @@ Dynamically composed based on the user's confirmed service list. Below is the JS
 | `subscription` | | string | Subscription name (required when using hierarchy) |
 | `resourceGroup` | | string | Resource group name (required when using hierarchy) |
 
-**Service Type List (by category):**
-
-| Category | Types |
-|----------|-------|
-| **AI** | `ai_foundry`, `ai_hub`, `openai`, `ai_search` / `search`, `document_intelligence` / `form_recognizer`, `aml` |
-| **Data** | `storage` / `adls`, `cosmos_db`, `sql_database`, `sql_server`, `databricks`, `data_factory` / `adf`, `fabric`, `redis`, `stream_analytics`, `synapse` |
-| **Security** | `keyvault` / `kv` |
-| **Compute** | `app_service` / `appservice`, `function_app`, `vm`, `aks`, `acr` / `container_registry` |
-| **Network** | `firewall`, `bastion`, `vpn_gateway` / `vpn`, `app_gateway`, `front_door`, `cdn`, `nsg`, `pe` |
-| **IoT** | `iot_hub` |
-| **Integration** | `event_hub` |
-| **Monitoring** | `log_analytics`, `app_insights` / `appinsights`, `monitor` |
-| **DevOps** | `devops` |
-| **Other** | `jumpbox`, `user`, etc. (unrecognized types use fuzzy matching + default icon) |
+**Service Type — Canonical Reference:**
+
+> ⚠️ **CRITICAL**: Always use the **canonical type** from the table below. Do NOT use Azure ARM resource names (e.g., `private_endpoints`, `storage_accounts`, `data_factories`). The generator normalizes common variants, but using canonical types ensures correct icon rendering, PE detection, and color coding.
+
+| Category | Canonical Type | Azure Resource | Icon |
+|----------|---------------|----------------|------|
+| **AI** | `ai_foundry` | Microsoft.CognitiveServices/accounts (kind: AIServices) | AI Foundry |
+| | `openai` | Microsoft.CognitiveServices/accounts (kind: OpenAI) | Azure OpenAI |
+| | `ai_hub` | Foundry Project | AI Studio |
+| | `search` | Microsoft.Search/searchServices | Cognitive Search |
+| | `document_intelligence` | Microsoft.CognitiveServices/accounts (kind: FormRecognizer) | Form Recognizer |
+| | `aml` | Microsoft.MachineLearningServices/workspaces | Machine Learning |
+| **Data** | `fabric` | Microsoft.Fabric/capacities | Microsoft Fabric |
+| | `adf` | Microsoft.DataFactory/factories | Data Factory |
+| | `storage` | Microsoft.Storage/storageAccounts | Storage Account |
+| | `adls` | ADLS Gen2 (Storage with HNS) | Data Lake |
+| | `cosmos_db` | Microsoft.DocumentDB/databaseAccounts | Cosmos DB |
+| | `sql_database` | Microsoft.Sql/servers/databases | SQL Database |
+| | `sql_server` | Microsoft.Sql/servers | SQL Server |
+| | `databricks` | Microsoft.Databricks/workspaces | Databricks |
+| | `synapse` | Microsoft.Synapse/workspaces | Synapse Analytics |
+| | `redis` | Microsoft.Cache/redis | Redis Cache |
+| | `stream_analytics` | Microsoft.StreamAnalytics/streamingjobs | Stream Analytics |
+| | `postgresql` | Microsoft.DBforPostgreSQL/flexibleServers | PostgreSQL |
+| | `mysql` | Microsoft.DBforMySQL/flexibleServers | MySQL |
+| **Security** | `keyvault` | Microsoft.KeyVault/vaults | Key Vault |
+| | `sentinel` | Microsoft.SecurityInsights | Sentinel |
+| **Compute** | `appservice` | Microsoft.Web/sites | App Service |
+| | `function_app` | Microsoft.Web/sites (kind: functionapp) | Function App |
+| | `vm` | Microsoft.Compute/virtualMachines | Virtual Machine |
+| | `aks` | Microsoft.ContainerService/managedClusters | AKS |
+| | `acr` | Microsoft.ContainerRegistry/registries | Container Registry |
+| | `container_apps` | Microsoft.App/containerApps | Container Apps |
+| | `static_web_app` | Microsoft.Web/staticSites | Static Web App |
+| | `spring_apps` | Microsoft.AppPlatform/Spring | Spring Apps |
+| **Network** | `pe` | Microsoft.Network/privateEndpoints | Private Endpoint |
+| | `vnet` | Microsoft.Network/virtualNetworks | VNet |
+| | `nsg` | Microsoft.Network/networkSecurityGroups | NSG |
+| | `firewall` | Microsoft.Network/azureFirewalls | Firewall |
+| | `bastion` | Microsoft.Network/bastionHosts | Bastion |
+| | `app_gateway` | Microsoft.Network/applicationGateways | App Gateway |
+| | `front_door` | Microsoft.Cdn/profiles (Front Door) | Front Door |
+| | `vpn` | Microsoft.Network/virtualNetworkGateways | VPN Gateway |
+| | `load_balancer` | Microsoft.Network/loadBalancers | Load Balancer |
+| | `nat_gateway` | Microsoft.Network/natGateways | NAT Gateway |
+| | `cdn` | Microsoft.Cdn/profiles | CDN |
+| **IoT** | `iot_hub` | Microsoft.Devices/IotHubs | IoT Hub |
+| | `digital_twins` | Microsoft.DigitalTwins/digitalTwinsInstances | Digital Twins |
+| **Integration** | `event_hub` | Microsoft.EventHub/namespaces | Event Hub |
+| | `event_grid` | Microsoft.EventGrid/topics | Event Grid |
+| | `apim` | Microsoft.ApiManagement/service | API Management |
+| | `service_bus` | Microsoft.ServiceBus/namespaces | Service Bus |
+| | `logic_apps` | Microsoft.Logic/workflows | Logic Apps |
+| **Monitoring** | `log_analytics` | Microsoft.OperationalInsights/workspaces | Log Analytics |
+| | `appinsights` | Microsoft.Insights/components | App Insights |
+| | `monitor` | Azure Monitor | Monitor |
+| **Other** | `jumpbox`, `user`, `devops` | — | Special |
 
 **When Using Private Endpoints — PE Node Addition Required:**
 

skills/azure-architecture-autopilot/scripts/generator.py

@@ -22,7 +22,7 @@
     "ai_foundry": {
         "icon_svg": '<rect x="6" y="10" width="36" height="28" rx="4" fill="#0078D4"/><rect x="12" y="16" width="10" height="8" rx="2" fill="white" opacity="0.9"/><rect x="26" y="16" width="10" height="8" rx="2" fill="white" opacity="0.9"/><rect x="12" y="27" width="24" height="5" rx="2" fill="white" opacity="0.6"/>',
         "color": "#0078D4", "bg": "#E8F4FD", "category": "AI",
-        "azure_icon_key": "azure_openai"
+        "azure_icon_key": "ai_foundry"
     },
     "ai_hub": {
         "icon_svg": '<rect x="6" y="10" width="36" height="28" rx="4" fill="#0078D4"/><circle cx="24" cy="24" r="8" fill="white" opacity="0.9"/><circle cx="24" cy="24" r="4" fill="#0078D4"/>',
@@ -57,7 +57,7 @@
     "fabric": {
         "icon_svg": '<polygon points="24,6 42,18 42,34 24,46 6,34 6,18" fill="#E8740C" opacity="0.9"/><text x="24" y="30" text-anchor="middle" font-size="14" fill="white" font-weight="700">F</text>',
         "color": "#E8740C", "bg": "#FEF3E8", "category": "Data",
-        "azure_icon_key": "managed_service_fabric"
+        "azure_icon_key": "microsoft_fabric"
     },
     "synapse": {
         "icon_svg": '<circle cx="24" cy="24" r="18" fill="#0078D4"/><path d="M15 24 L24 15 L33 24 L24 33 Z" fill="white" opacity="0.9"/>',
@@ -407,8 +407,74 @@
 }
 
 
+_TYPE_ALIASES = {
+    # Azure ARM resource names → canonical diagram type
+    # Network
+    "private_endpoints": "pe", "private_endpoint": "pe",
+    "virtual_networks": "vnet", "virtual_network": "vnet",
+    "network_security_groups": "nsg", "network_security_group": "nsg",
+    "bastion_hosts": "bastion", "bastion_host": "bastion",
+    "application_gateways": "app_gateway", "application_gateway": "app_gateway",
+    "front_doors": "front_door", "front_door_and_cdn_profiles": "front_door",
+    "virtual_network_gateways": "vpn", "vpn_gateways": "vpn",
+    "load_balancers": "load_balancer",
+    "nat_gateways": "nat_gateway",
+    "expressroute_circuits": "expressroute",
+    "firewalls": "firewall",
+    "cdn_profiles": "cdn",
+    # Data
+    "data_factories": "adf", "data_factory": "adf",
+    "storage_accounts": "storage", "storage_account": "storage",
+    "data_lake": "adls", "adls_gen2": "adls", "data_lake_storage": "adls",
+    "fabric_capacities": "fabric", "fabric_capacity": "fabric", "microsoft_fabric": "fabric",
+    "synapse_workspaces": "synapse", "synapse_workspace": "synapse", "synapse_analytics": "synapse",
+    "cosmos": "cosmos_db", "cosmosdb": "cosmos_db", "documentdb": "cosmos_db",
+    "sql_databases": "sql_database", "sql_db": "sql_database",
+    "sql_servers": "sql_server",
+    "redis_caches": "redis", "redis_cache": "redis", "cache_redis": "redis",
+    "stream_analytics_jobs": "stream_analytics",
+    "databricks_workspaces": "databricks",
+    "data_explorer_clusters": "data_explorer", "azure_data_explorer": "data_explorer",
+    "postgresql_server": "postgresql", "postgresql_servers": "postgresql",
+    "mysql_server": "mysql", "mysql_servers": "mysql",
+    # AI
+    "cognitive_services": "ai_foundry", "ai_services": "ai_foundry", "foundry": "ai_foundry",
+    "azure_openai": "openai",
+    "cognitive_search": "search", "search_services": "search", "search_service": "search",
+    "machine_learning": "aml", "ml": "aml", "machine_learning_workspaces": "aml",
+    "form_recognizers": "document_intelligence",
+    "ai_studio": "ai_hub", "foundry_project": "ai_hub",
+    # Security
+    "key_vault": "keyvault", "key_vaults": "keyvault",
+    "sentinel": "sentinel", "azure_sentinel": "sentinel",
+    # Compute
+    "virtual_machines": "vm", "virtual_machine": "vm",
+    "app_services": "appservice", "web_apps": "appservice", "web_app": "appservice",
+    "function_apps": "function_app", "functions": "function_app",
+    "kubernetes_services": "aks", "managed_clusters": "aks", "kubernetes": "aks",
+    "container_registries": "acr",
+    "container_apps_environments": "container_apps",
+    "spring_apps": "spring_apps", "azure_spring_apps": "spring_apps",
+    "static_apps": "static_web_app", "static_web_apps": "static_web_app",
+    # Integration
+    "event_hubs": "event_hub",
+    "event_grid_topics": "event_grid", "event_grid_domains": "event_grid",
+    "api_management_services": "apim",
+    "service_bus_namespaces": "service_bus",
+    "logic_app": "logic_apps",
+    "notification_hubs": "notification_hub",
+    # Monitoring
+    "log_analytics_workspaces": "log_analytics",
+    "application_insights": "appinsights", "app_insight": "appinsights",
+    # IoT
+    "iot_hubs": "iot_hub",
+    # Management
+    "backup_vaults": "backup", "backup_vault": "backup",
+}
+
 def get_service_info(svc_type: str) -> dict:
     t = svc_type.lower().replace("-", "_").replace(" ", "_")
+    t = _TYPE_ALIASES.get(t, t)
     info = SERVICE_ICONS.get(t, SERVICE_ICONS["default"]).copy()
     # Add official Azure icon data URI if available
     azure_key = info.get("azure_icon_key", t)
@@ -418,10 +484,14 @@ def get_service_info(svc_type: str) -> dict:
 
 
 def generate_html(services: list, connections: list, title: str, vnet_info: str = "", hierarchy: list = None) -> str:
+    def _norm(t):
+        t = t.lower().replace("-", "_").replace(" ", "_")
+        return _TYPE_ALIASES.get(t, t)
+
     nodes_js = json.dumps([{
         "id": svc["id"],
         "name": svc["name"],
-        "type": svc.get("type", "default"),
+        "type": _norm(svc.get("type", "default")),
         "sku": svc.get("sku", ""),
         "private": svc.get("private", False),
         "details": svc.get("details", []),
@@ -445,7 +515,7 @@ def generate_html(services: list, connections: list, title: str, vnet_info: str
         "dash": CONNECTION_STYLES.get(conn.get("type", "default"), CONNECTION_STYLES["default"])["dash"],
     } for conn in connections], ensure_ascii=False)
 
-    pe_count = sum(1 for s in services if s.get("type", "default") == "pe")
+    pe_count = sum(1 for s in services if _norm(s.get("type", "default")) == "pe")
     svc_count = len(services) - pe_count
     generated_at = datetime.now().strftime("%Y-%m-%d %H:%M")
     vnet_info_js = json.dumps(vnet_info, ensure_ascii=False)