Merge branch 'main' into CopySharedCode

Author: mikeharder

.github/CODEOWNERS

@@ -10,7 +10,7 @@
 
 # Core
 # PRLabel: %Core.Http
-/sdk/core/corehttp/                                                  @lmazuel @annatisch @johanste @iscai-msft @kashifkhan
+/sdk/core/corehttp/                                                  @lmazuel @johanste @iscai-msft @kashifkhan
 
 # AzureSdkOwners: @kashifkhan
 # ServiceLabel: %Core.Http
@@ -19,12 +19,12 @@
 # ServiceLabel: %Azure.Core
 
 # PRLabel: %Azure.Core
-/sdk/core/                                                           @lmazuel @annatisch @johanste
-/sdk/core/azure-core/                                                @lmazuel @annatisch @johanste @iscai-msft @kashifkhan
+/sdk/core/                                                           @lmazuel @johanste
+/sdk/core/azure-core/                                                @lmazuel @johanste @iscai-msft @kashifkhan
 /sdk/core/azure-mgmt-core/                                           @msyyc
 
 # Smoke Tests
-/common/smoketest/                                                   @lmazuel @chlowell @annatisch @mccoyp @shurd @southpolesteve
+/common/smoketest/                                                   @lmazuel @chlowell @mccoyp @shurd @southpolesteve
 
 ####################
 # Client Libraries
@@ -70,7 +70,7 @@
 
 # ServiceLabel: %Batch
 # PRLabel: %Batch
-/sdk/batch/    @cRui861 @dpwatrous @jingjlii @JJJessieWang @wanghoppe @wiboris
+/sdk/batch/    @cRui861 @dpwatrous @jingjlii @JJJessieWang @wanghoppe @wiboris @lilinvictorms @iwang2 @xingwu1
 
 # ServiceLabel: %Cognitive - Anomaly Detector
 # PRLabel: %Cognitive - Anomaly Detector
@@ -753,7 +753,7 @@
 # ServiceOwners: @amber-yujueWang @rhurey @xitzhang @pankopon @emilyjiji
 
 # PRLabel: %Storage
-/sdk/storage/    @annatisch @jalauzon-msft @vincenttran-msft @weirongw23-msft
+/sdk/storage/    @jalauzon-msft @vincenttran-msft @weirongw23-msft
 
 # ServiceLabel: %Storage
 # ServiceOwners: @jalauzon-msft @vincenttran-msft

.github/skills/azsdk-common-generate-sdk-locally/SKILL.md

@@ -4,7 +4,7 @@ license: MIT
 metadata:
   version: "1.1.0"
   distribution: shared
-description: "Generate, build, and test Azure SDKs locally from TypeSpec with automatic customization. WHEN: \"generate SDK locally\", \"build SDK\", \"run SDK tests\", \"update changelog\", \"fix SDK build errors\", \"fix breaking changes\", \"resolve SDK generation errors\", \"customize TypeSpec\", \"rename SDK client\", \"rename SDK model\", \"hide operation from SDK\", \"fix analyzer errors\", \"resolve customization drift\", \"create subclient\", \"update metadata\", \"update version\". DO NOT USE FOR: publishing to package registries, CI pipeline configuration, API design review. INVOKES: azsdk_verify_setup, azsdk_package_generate_code, azsdk_package_build_code, azsdk_package_run_check, azsdk_package_run_tests, azsdk_customized_code_update, azsdk_package_update_changelog_content, azsdk_package_update_metadata, azsdk_package_update_version."
+description: "Generate, build, and test Azure SDKs locally from TypeSpec with automatic customization. WHEN: \"generate SDK locally\", \"build SDK\", \"run SDK tests\", \"run CI checks\", \"validate package\", \"run checks\", \"update changelog\", \"fix SDK build errors\", \"fix breaking changes\", \"resolve SDK generation errors\", \"customize TypeSpec\", \"rename SDK client\", \"rename SDK model\", \"hide operation from SDK\", \"fix analyzer errors\", \"resolve customization drift\", \"create subclient\", \"update metadata\", \"update version\". DO NOT USE FOR: publishing to package registries, CI pipeline configuration, API design review. INVOKES: azsdk_verify_setup, azsdk_package_generate_code, azsdk_package_build_code, azsdk_package_run_check, azsdk_package_run_tests, azsdk_customized_code_update, azsdk_package_update_changelog_content, azsdk_package_update_metadata, azsdk_package_update_version."
 compatibility: "azure-sdk-mcp server, local azure-sdk-for-{language} clone, language build tools"
 ---
 
@@ -44,10 +44,17 @@ Prerequisites: azure-sdk-mcp server must be running. Without MCP, use `npx tsp-c
 
 [SDK repos](references/sdk-repos.md) | [Customization workflow](references/customization-workflow.md) | [Detailed workflow](references/detailed-workflow.md)
 
+## Guardrails
+
+- **NEVER modify generated SDK code files directly for customizations.** Always use `azure-sdk-mcp:azsdk_customized_code_update`. It handles classification, TypeSpec decorators, code patches, regeneration, and build as a single atomic workflow.
+- If `azure-sdk-mcp:azsdk_customized_code_update` fails or times out, **report the error to the user** and suggest retrying. Do not attempt to replicate its behavior by editing files manually.
+- Only the customization tool understands the correct layering of TypeSpec decorators vs code patches and ensures regenerated code stays consistent.
+
 ## Examples
 
 - "Generate the SDK locally for my TypeSpec service"
 - "Build and test the Python SDK package"
+- "Run CI checks for my SDK package"
 - "Fix the SDK build errors on this PR"
 - "The SDK generation has breaking changes, resolve them"
 - "Rename FooClient to BarClient for .NET"
@@ -65,4 +72,5 @@ Prerequisites: azure-sdk-mcp server must be running. Without MCP, use `npx tsp-c
 - Run `azure-sdk-mcp:azsdk_verify_setup` to confirm MCP and tools.
 - If build fails with type conflicts, breaking changes, analyzer errors, or customization drift, use `azure-sdk-mcp:azsdk_customized_code_update` to apply customizations.
 - The customization tool uses a two-phase approach: TypeSpec decorators first (Phase A), then code repairs if needed (Phase B).
+- If `azure-sdk-mcp:azsdk_customized_code_update` fails or times out, report the error and retry. Do not manually edit generated SDK code — manual edits will be overwritten on the next regeneration.
 - Without MCP, use `npx tsp-client` CLI.

.github/skills/azsdk-common-prepare-release-plan/SKILL.md

@@ -4,50 +4,164 @@ license: MIT
 metadata:
   version: "1.0.0"
   distribution: shared
-description: "Create and manage release plan work items for Azure SDK releases across languages. **UTILITY SKILL**. USE FOR: \"create release plan\", \"update release plan\", \"link SDK PR to plan\", \"namespace approval\", \"check release plan status\". DO NOT USE FOR: SDK code generation, pipeline troubleshooting, API review feedback. INVOKES: azure-sdk-mcp:azsdk_create_release_plan, azure-sdk-mcp:azsdk_get_release_plan, azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan."
-compatibility: "azure-sdk-mcp server, API spec PR, or TypeSpec project path"
+description: 'Create, get, update, abandon, and link SDK PRs to release plan work items for Azure SDK releases. **UTILITY SKILL**. USE FOR: "create release plan", "get release plan", "update release plan", "update API spec in release plan", "update SDK details in release plan", "abandon release plan", "link SDK PR to plan", "namespace approval", "check release plan status". DO NOT USE FOR: SDK code generation, pipeline troubleshooting, API review feedback. INVOKES: azure-sdk-mcp:azsdk_create_release_plan, azure-sdk-mcp:azsdk_get_release_plan, azure-sdk-mcp:azsdk_get_release_plan_for_spec_pr, azure-sdk-mcp:azsdk_update_release_plan, azure-sdk-mcp:azsdk_update_api_spec_pull_request_in_release_plan, azure-sdk-mcp:azsdk_update_sdk_details_in_release_plan, azure-sdk-mcp:azsdk_abandon_release_plan, azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan.'
+compatibility:
+  requires: "azure-sdk-mcp server, API spec PR in Azure/azure-rest-api-specs"
 ---
 
 # Prepare Release Plan
 
-> Do not display Azure DevOps work item URLs. Only provide Release Plan Link and ID.
+> **CRITICAL**: Do not display Azure DevOps work item URLs. Only provide Release Plan Link and Release Plan ID to the user.
 
 ## MCP Tools
 
-| Tool | Purpose |
-|------|---------|
-| `azure-sdk-mcp:azsdk_create_release_plan` | Create plan |
-| `azure-sdk-mcp:azsdk_get_release_plan` | Get details |
-| `azure-sdk-mcp:azsdk_get_release_plan_for_spec_pr` | Find by spec PR |
-| `azure-sdk-mcp:azsdk_update_release_plan` | Update plan fields |
-| `azure-sdk-mcp:azsdk_update_sdk_details_in_release_plan` | Update SDK info |
-| `azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan` | Link SDK PR |
-| `azure-sdk-mcp:azsdk_link_namespace_approval_issue` | Link namespace |
-| `azure-sdk-mcp:azsdk_update_api_spec_pull_request_in_release_plan` | Update spec PR |
-
-## Steps
-
-1. **Prerequisites** — Check for API spec PR link or a TypeSpec project path; prompt if unavailable.
-2. **Check Existing** — Query by release plan number or spec PR link (do not query by work item ID).
-3. **Gather Info** — Collect Service Tree IDs, timeline, and API release type. See [details](references/release-plan-details.md).
-4. **API Release Type** — Ask user for API release type: "Private Preview", "Public Preview", or "GA". This is required.
-5. **Validate Spec PR** — If spec PR is provided, validate it matches the API release type:
-   - Private Preview → must be in `azure-rest-api-specs-pr`
-   - Public Preview / GA → must be in `azure-rest-api-specs`
-6. **Create** — Run `azure-sdk-mcp:azsdk_create_release_plan` with `apiReleaseType` parameter. SDK release type defaults automatically (beta for preview, stable for GA).
-7. **Namespace** — For mgmt plane first releases, link approval issue.
-8. **Link PRs** — Link SDK PRs to plan.
+| Tool                                                               | Purpose                            |
+| ------------------------------------------------------------------ | ---------------------------------- |
+| `azure-sdk-mcp:azsdk_create_release_plan`                          | Create a new release plan          |
+| `azure-sdk-mcp:azsdk_get_release_plan`                             | Get release plan details by ID     |
+| `azure-sdk-mcp:azsdk_get_release_plan_for_spec_pr`                 | Find release plan by spec PR URL   |
+| `azure-sdk-mcp:azsdk_update_release_plan`                          | Update release plan metadata       |
+| `azure-sdk-mcp:azsdk_update_api_spec_pull_request_in_release_plan` | Update API spec PR URL in plan     |
+| `azure-sdk-mcp:azsdk_update_sdk_details_in_release_plan`           | Update SDK/package details in plan |
+| `azure-sdk-mcp:azsdk_abandon_release_plan`                         | Abandon a release plan             |
+| `azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan`        | Link SDK PR to release plan        |
+| `azure-sdk-mcp:azsdk_link_namespace_approval_issue`                | Link namespace approval issue      |
+
+---
+
+## Use Cases
+
+### 1. Create Release Plan
+
+**When**: User wants to create a release plan for a TypeSpec project.
+
+**Steps**:
+
+1. **Get TypeSpec Project Path** — Ask the user for the relative TypeSpec project path (directory containing `tspconfig.yaml`, e.g. `specification/contosowidgetmanager/Contoso.WidgetManager`). Always use the relative path from the repo root, not an absolute path.
+2. **Check Existing** — Run `azure-sdk-mcp:azsdk_get_release_plan` with the relative `typeSpecProjectPath` to check if a release plan already exists.
+   - If a release plan exists with the **same API release type** the user requested: inform the user that a release plan already exists, show the Release Plan ID, status, and API release type. Suggest the user use the existing release plan. Do NOT create a new one.
+   - If a release plan exists but for a **different API release type**: inform the user about the existing plan and its API release type, then proceed to create a new release plan using `forceCreateReleasePlan: true` for the user's requested API release type. Do NOT attempt to update the existing release plan's API release type.
+   - If no release plan exists, proceed to step 3.
+3. **Gather Info** — Collect required details from the user. See [details](references/release-plan-details.md):
+   - Target release month/year (format: "Month YYYY", e.g. "June 2026"). Do NOT use formats like "2026-06" or "06/2026" — these are invalid.
+   - API release type: Value must be one of the following: "Private Preview", "Public Preview", or "GA"
+   - SDK release type: Value must be "beta" or "stable" — always ask the user explicitly
+   - Spec PR URL (optional)
+   - Service Tree ID (GUID) — optional if previously created
+   - Product Tree ID (GUID) — optional if previously created
+4. **Create** — Run `azure-sdk-mcp:azsdk_create_release_plan` with the collected parameters including `sdkReleaseType`. Use `forceCreateReleasePlan: true` only if an existing release plan was found for a different API release type.
+5. **Namespace** — For first management plane releases, link namespace approval issue using `azure-sdk-mcp:azsdk_link_namespace_approval_issue`.
+
+> **IMPORTANT**: Do NOT default the API release type value as the SDK release type. These are separate fields — always ask the user explicitly for the SDK release type.
+>
+> **IMPORTANT**: Do NOT update an existing release plan to change its API release type. If a release plan exists for a different API release type, force-create a new one instead.
+
+**Tool**: `azure-sdk-mcp:azsdk_create_release_plan`
+
+---
+
+### 2. Get Release Plan
+
+**When**: User wants to check the status or details of an existing release plan.
+
+**Steps**:
+
+1. **Identify Plan** — Ask user for one of:
+   - Release plan ID or work item ID
+   - Relative TypeSpec project path (e.g. `specification/contosowidgetmanager/Contoso.WidgetManager`)
+   - Spec PR URL
+2. **Query** — Run `azure-sdk-mcp:azsdk_get_release_plan` with the provided identifier (always use relative path for `typeSpecProjectPath`), OR run `azure-sdk-mcp:azsdk_get_release_plan_for_spec_pr` if only a spec PR URL is available.
+3. **Display** — Show the release plan ID, status, linked PRs, and SDK details.
+
+**Tools**: `azure-sdk-mcp:azsdk_get_release_plan`, `azure-sdk-mcp:azsdk_get_release_plan_for_spec_pr`
+
+---
+
+### 3. Update Release Plan / Update API Spec in Release Plan
+
+**When**: User needs to update release plan metadata (spec PR URL, TypeSpec project path, SDK release type, service/product IDs) or update the API spec PR link.
+
+**Steps**:
+
+1. **Identify Plan** — Get the work item ID or TypeSpec project path from the user.
+2. **Update Metadata** — Run `azure-sdk-mcp:azsdk_update_release_plan` with:
+   - `typeSpecProjectPath` (required)
+   - `workItemId` (optional — resolved from TypeSpec path or spec PR if not provided)
+   - `specPullRequestUrl` (optional)
+   - `sdkReleaseType` (required — do NOT default this from API release type; always ask user explicitly)
+   - `serviceTreeId` (optional)
+   - `productTreeId` (optional)
+3. **Update API Spec PR** — If only the spec PR URL needs updating, run `azure-sdk-mcp:azsdk_update_api_spec_pull_request_in_release_plan` with:
+   - `specPullRequestUrl` (required)
+   - `workItemId` or `releasePlanId`
+
+**Tools**: `azure-sdk-mcp:azsdk_update_release_plan`, `azure-sdk-mcp:azsdk_update_api_spec_pull_request_in_release_plan`
+
+---
+
+### 4. Update SDK/Package Details in Release Plan
+
+**When**: User needs to update SDK language and package name details in the release plan after code generation or configuration changes.
+
+**Steps**:
+
+1. **Identify Plan** — Get the release plan work item ID from the user.
+2. **Identify TypeSpec Project** — Get or confirm the TypeSpec project path.
+3. **Update** — Run `azure-sdk-mcp:azsdk_update_sdk_details_in_release_plan` with:
+   - `releasePlanWorkItemId` (required)
+   - `typeSpecProjectPath` (required)
+
+**Tool**: `azure-sdk-mcp:azsdk_update_sdk_details_in_release_plan`
+
+---
+
+### 5. Abandon a Release Plan
+
+**When**: User decides to cancel or discard a release plan that is no longer needed.
+
+**Steps**:
+
+1. **Identify Plan** — Get the work item ID or release plan ID from the user.
+2. **Confirm** — Ask user to confirm abandonment: "Are you sure you want to abandon this release plan? This action updates the status to Abandoned."
+3. **Abandon** — Run `azure-sdk-mcp:azsdk_abandon_release_plan` with:
+   - `workItemId` or `releasePlanId`
+
+**Tool**: `azure-sdk-mcp:azsdk_abandon_release_plan`
+
+---
+
+### 6. Link SDK Pull Request to Release Plan
+
+**When**: SDK pull requests have been created and need to be associated with the release plan.
+
+**Steps**:
+
+1. **Identify Plan** — Get the work item ID or release plan ID.
+2. **Collect PR Info** — Get the SDK pull request URL and language from the user.
+3. **Link** — Run `azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan` with:
+   - `pullRequestUrl` (required)
+   - `language` (required — e.g., ".NET", "Java", "JavaScript", "Python", "Go")
+   - `workItemId` or `releasePlanId`
+4. **Repeat** — If multiple SDK PRs exist for different languages, repeat for each.
+
+**Tool**: `azure-sdk-mcp:azsdk_link_sdk_pull_request_to_release_plan`
+
+---
 
 ## Examples
 
 - "Create a release plan for my spec PR"
-- "Create a release plan for my TypeSpec project"
-- "Create a private preview release plan"
-- "Create a GA release plan for my spec PR"
+- "Get the release plan for work item 12345"
+- "What is the status of my release plan?"
+- "Update the API spec PR in my release plan"
+- "Update SDK details in release plan 67890"
+- "Abandon release plan 11111"
 - "Link my SDK PR to release plan"
+- "Link Python SDK PR #100 to release plan 67890"
 
 ## Troubleshooting
 
-- Requires `azure-sdk-mcp` server; no CLI fallback.
-- If creation fails, verify Service Tree IDs and the provided spec PR URL or TypeSpec project path.
-- If spec PR validation fails, check that the spec PR repo matches the API release type (private repo for Private Preview, public repo for Public Preview/GA).
+- Requires `azure-sdk-mcp` server; no CLI fallback — prompt user to configure MCP if unavailable.
+- If creation fails, verify spec PR URL and Service Tree IDs.
+- If update fails, ensure the work item ID or release plan ID is correct and the plan is not already abandoned.
+- If linking fails, verify the SDK PR URL is valid and the language matches a supported value.