updates added for PR comments

Co-authored-by: Copilot <copilot@github.com>

Author: Ba4bes

plugin/skills/azure-iac-generator/SKILL.md

@@ -13,9 +13,9 @@ Reverse-engineer live Azure resources or Draw.io diagrams into deployment-ready,
 
 ## Prerequisites
 
-- Authenticated Azure CLI session (`az login`)
 - Azure MCP and Bicep MCP servers available
 - For diagram source: a `.drawio` file in the workspace
+- For live Azure / `azure-to-bicep`: an authenticated Azure CLI session (`az login`) with access to the target subscription and resource group
 
 ## When to Use This Skill
 
@@ -34,7 +34,7 @@ Reverse-engineer live Azure resources or Draw.io diagrams into deployment-ready,
 
 ## Design Notes
 
-Named `azure-iac-generator` rather than `azure-bicep-generator` to accommodate future IaC tooling such as Terraform. Bicep is the only supported target today; Terraform support is reserved for a future iteration.
+Named `azure-iac-generator` rather than `azure-bicep-generator` to leave room for future expansion to additional Infrastructure as Code targets. Bicep is the only supported target today.
 
 ## Routing — MUST follow the matched workflow
 

plugin/skills/azure-iac-generator/references/azure-resource-model.md

@@ -32,8 +32,9 @@ Each Azure environment is represented as a **resource model** — a JSON structu
 
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
-| `id` | string | Yes | Unique identifier within the model. Use a short slug (e.g., `vm-web-01`). |
-| `type` | string | Yes | Azure resource provider type (e.g., `Microsoft.Compute/virtualMachines`). |
+| `id` | string | Yes | **Canonical ARM resource ID** (for example, `/subscriptions/<sub>/resourceGroups/<rg>/providers/Microsoft.Compute/virtualMachines/vm-web-01`). This is the primary key for matching resources across workflows. |
+| `localId` | string | No | Optional short slug for readability (for example, `vm-web-01`). Do not use as the canonical identifier. |
+| `type` | string | Yes | Azure resource provider type (for example, `Microsoft.Compute/virtualMachines`). Must align with `id`. |
 | `name` | string | Yes | Display name of the resource. |
 | `resourceGroup` | string | No | Resource group the resource belongs to. |
 | `location` | string | No | Azure region (e.g., `eastus`, `westeurope`). |
@@ -52,16 +53,16 @@ Each Azure environment is represented as a **resource model** — a JSON structu
 | `secures` | Security association | NSG secures Subnet |
 | `routes` | Traffic routing | Load Balancer routes to VM |
 
-## Usage by Skill
+## Usage by Workflow  
 
-- **azure-to-bicep**: Builds a resource model from live Azure resources; generates Bicep from it.
-- **azure-to-diagram**: Builds a resource model from live Azure resources; generates Draw.io XML from it.
-- **bicep-diagram-sync**: Parses both Bicep and Draw.io into resource models and compares them.
-- **bicep-policy-check**: Parses Bicep into a resource model to evaluate against Azure Policy.
-- **bicep-whatif**: Parses Bicep into a resource model and compares it against live Azure state.
-- **diagram-azure-sync**: Produces two resource models (diagram + live Azure) and compares them (quick or deep mode).
-- **diagram-to-bicep**: Parses Draw.io XML into a resource model; enriches it with configuration manifest; generates Bicep.
-- **sketch-to-diagram**: Produces a resource model from image analysis; generates Draw.io XML via stencil mapping.
+- **Azure to Bicep workflow**: Builds a resource model from live Azure resources; generates Bicep from it.  
+- **Azure to diagram workflow**: Builds a resource model from live Azure resources; generates Draw.io XML from it.  
+- **Bicep and diagram comparison workflow**: Parses both Bicep and Draw.io into resource models and compares them.  
+- **Bicep policy evaluation workflow**: Parses Bicep into a resource model to evaluate against Azure Policy.  
+- **Bicep what-if comparison workflow**: Parses Bicep into a resource model and compares it against live Azure state.  
+- **Diagram and Azure sync workflow**: Produces two resource models (diagram + live Azure) and compares them (quick or deep mode).  
+- **Diagram to Bicep workflow**: Parses Draw.io XML into a resource model; enriches it with configuration manifest; generates Bicep.  
+- **Sketch to diagram workflow**: Produces a resource model from image analysis; generates Draw.io XML via stencil mapping.  
 
 ## Common Azure Resource Types
 

plugin/skills/azure-iac-generator/references/resource-configs-compute.md

@@ -8,7 +8,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.Compute/virtualMachines
 
-**MCP Tool**: `mcp_azure_compute`
+**MCP Tool**: `mcp_azure_mcp_compute`
 **Fallback**: `az vm show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -27,7 +27,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.Compute/virtualMachineScaleSets
 
-**MCP Tool**: `mcp_azure_compute`
+**MCP Tool**: `mcp_azure_mcp_compute`
 **Fallback**: `az vmss show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -39,7 +39,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.Web/serverfarms
 
-**MCP Tool**: `mcp_azure_appservice`
+**MCP Tool**: `mcp_azure_mcp_appservice`
 **Fallback**: `az appservice plan show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -52,7 +52,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.Web/sites
 
-**MCP Tool**: `mcp_azure_appservice`
+**MCP Tool**: `mcp_azure_mcp_appservice`
 **Fallback**: `az webapp show --ids <resourceId> -o json` + `az webapp config show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -68,7 +68,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.Web/sites/functions
 
-**MCP Tool**: `mcp_azure_appservice`
+**MCP Tool**: `mcp_azure_mcp_appservice`
 **Fallback**: `az functionapp show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -80,7 +80,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.ContainerService/managedClusters
 
-**MCP Tool**: `mcp_azure_aks`
+**MCP Tool**: `mcp_azure_mcp_aks`
 **Fallback**: `az aks show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -95,7 +95,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.App/managedEnvironments
 
-**MCP Tool**: `mcp_azure_containerapps`
+**MCP Tool**: `mcp_azure_mcp_containerapps`
 **Fallback**: `az containerapp env show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -105,7 +105,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.App/containerApps
 
-**MCP Tool**: `mcp_azure_containerapps`
+**MCP Tool**: `mcp_azure_mcp_containerapps`
 **Fallback**: `az containerapp show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -120,7 +120,7 @@ Per-resource property retrieval for compute and container resource types.
 
 ### Microsoft.ContainerRegistry/registries
 
-**MCP Tool**: `mcp_azure_acr`
+**MCP Tool**: `mcp_azure_mcp_acr`
 **Fallback**: `az acr show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |

plugin/skills/azure-iac-generator/references/resource-configs-data.md

@@ -8,7 +8,7 @@ Per-resource property retrieval for data and storage resource types.
 
 ### Microsoft.Storage/storageAccounts
 
-**MCP Tool**: `mcp_azure_storage`
+**MCP Tool**: `mcp_azure_mcp_storage`
 **Fallback**: `az storage account show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -24,7 +24,7 @@ Per-resource property retrieval for data and storage resource types.
 
 ### Microsoft.Sql/servers
 
-**MCP Tool**: `mcp_azure_sql`
+**MCP Tool**: `mcp_azure_mcp_sql`
 **Fallback**: `az sql server show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -35,7 +35,7 @@ Per-resource property retrieval for data and storage resource types.
 
 ### Microsoft.Sql/servers/databases
 
-**MCP Tool**: `mcp_azure_sql`
+**MCP Tool**: `mcp_azure_mcp_sql`
 **Fallback**: `az sql db show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -49,7 +49,7 @@ Per-resource property retrieval for data and storage resource types.
 
 ### Microsoft.DocumentDB/databaseAccounts
 
-**MCP Tool**: `mcp_azure_cosmos`
+**MCP Tool**: `mcp_azure_mcp_cosmos`
 **Fallback**: `az cosmosdb show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -64,7 +64,7 @@ Per-resource property retrieval for data and storage resource types.
 
 ### Microsoft.Cache/redis
 
-**MCP Tool**: `mcp_azure_redis`
+**MCP Tool**: `mcp_azure_mcp_redis`
 **Fallback**: `az redis show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |

plugin/skills/azure-iac-generator/references/resource-configs-platform.md

@@ -8,7 +8,7 @@ Per-resource property retrieval for platform, security, and integration resource
 
 ### Microsoft.KeyVault/vaults
 
-**MCP Tool**: `mcp_azure_keyvault`
+**MCP Tool**: `mcp_azure_mcp_keyvault`
 **Fallback**: `az keyvault show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -22,7 +22,7 @@ Per-resource property retrieval for platform, security, and integration resource
 
 ### Microsoft.Insights/components
 
-**MCP Tool**: `mcp_azure_applicationinsights`
+**MCP Tool**: `mcp_azure_mcp_applicationinsights`
 **Fallback**: `az monitor app-insights component show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -33,7 +33,7 @@ Per-resource property retrieval for platform, security, and integration resource
 
 ### Microsoft.OperationalInsights/workspaces
 
-**MCP Tool**: `mcp_azure_monitor`
+**MCP Tool**: `mcp_azure_mcp_monitor`
 **Fallback**: `az monitor log-analytics workspace show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -43,7 +43,7 @@ Per-resource property retrieval for platform, security, and integration resource
 
 ### Microsoft.ServiceBus/namespaces
 
-**MCP Tool**: `mcp_azure_servicebus`
+**MCP Tool**: `mcp_azure_mcp_servicebus`
 **Fallback**: `az servicebus namespace show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |
@@ -54,7 +54,7 @@ Per-resource property retrieval for platform, security, and integration resource
 
 ### Microsoft.EventHub/namespaces
 
-**MCP Tool**: `mcp_azure_eventhubs`
+**MCP Tool**: `mcp_azure_mcp_eventhubs`
 **Fallback**: `az eventhubs namespace show --ids <resourceId> -o json`
 
 | Property | ARM JSON Path | Notes |

plugin/skills/azure-iac-generator/references/version-currency.md

@@ -19,15 +19,15 @@ All generated code must use current, supported versions. Stale defaults cause se
 
 ## Bicepparam Version Comments
 
-Always note the version choice in `.bicepparam` comments:
-
-```bicep
+Always note the version choice in `.bicepparam` comments. Treat the example below as a template only: look up the current supported runtime and support window at generation time rather than copying literal versions or dates from this document.  
+***bicep
 // Runtime stack for the App Service.
-//   DOTNET|10.0 → .NET 10 (LTS, supported until Nov 2028)
-//   NODE|22-lts → Node.js 22 LTS (supported until Apr 2027)
-//   PYTHON|3.13 → Python 3.13 (supported until Oct 2029)
-//   JAVA|21     → Java 21 LTS (supported until Sep 2028)
-param appServiceRuntimeStack = 'DOTNET|10.0'
+// Replace the placeholders below with the current supported values at generation time.
+// → (, supported until )
+// → (, supported until )
+// → (, supported until )
+// → (, supported until )
+param appServiceRuntimeStack = ''
 ```
 
 ## Hybrid Runtime Rule

tests/azure-iac-generator/integration.test.ts

@@ -54,7 +54,7 @@ const SAMPLE_DRAWIO_XML = `<?xml version="1.0" encoding="UTF-8"?>
   </root>
 </mxGraphModel></diagram></mxfile>`;
 
-describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   // ──────────────────────────────────────────────────────────────────