Jiaqi Zhang (JiaqiZhang-Dev) · Oct 14, 2026 · Oct 15, 2026 · Oct 15, 2026 · Oct 20, 2026 · Oct 20, 2026
@@ -35,6 +35,7 @@ class TenantID(str, Enum):
     AZURE_SDK_ONBOARDING = "azure_sdk_onboarding"
     AZURE_TYPESPEC_AUTHORING = "azure_typespec_authoring"
     API_SPEC_REVIEW_BOT = "api_spec_review_bot"
+    API_STEWARDSHIP_BOARD_QA_BOT = "api_stewardship_board_qa_bot"
     AZURE_MCP_SERVER = "azure_mcp_server"
     AZSDK_TOOLS_AGENT_QA_BOT = "azsdk_tools_agent_qa_bot"
     AZURE_SDK_QA_BOT = "azure_sdk_qa_bot"
@@ -66,6 +67,7 @@ class TenantID(str, Enum):
 SRC_AZURE_REST_API_SPECS_WIKI = "azure_rest_api_specs_wiki"
 SRC_AZURE_REST_API_SPECS_DOCS = "azure_rest_api_specs_docs"
 SRC_AZURE_OPENAPI_DIFF_DOCS = "azure_openapi_diff_docs"
+SRC_AZURE_AVOCADO_DOCS = "azure_avocado_docs"
 SRC_STATIC_CPEX_DOCS = "static_cpex_docs"
 
 # -- SDK language docs --
@@ -204,14 +206,19 @@ def _register(*sources: KnowledgeSource) -> None:
     ),
     KnowledgeSource(
         name=SRC_AZURE_REST_API_SPECS_DOCS,
-        description="Azure REST API specification documentation covering spec structure and conventions.",
+        description="Azure REST API specification guidance for CI checks, suppressions, breaking-change/OAD rules, ARM leases, and SDK package-name approval.",
         base_url="https://github.com/Azure/azure-rest-api-specs/blob/main/",
     ),
     KnowledgeSource(
         name=SRC_AZURE_OPENAPI_DIFF_DOCS,
         description="OpenAPI diff documentation for detecting and managing breaking changes in API specifications.",
         base_url="https://github.com/Azure/openapi-diff/blob/main/",
     ),
+    KnowledgeSource(
+        name=SRC_AZURE_AVOCADO_DOCS,
+        description="Avocado validation rules, default-tag API coverage, known issues, and troubleshooting for Azure REST API specifications.",
+        base_url="https://github.com/Azure/avocado/blob/main/",
+    ),
     KnowledgeSource(
         name=SRC_STATIC_CPEX_DOCS,
         description="Cloud Product Excellence (CPEX) documentation covering Azure-branded product lifecycle management, breaking change policy and process guidance, API breaking changes, S360 KPI requirements, preview/GA readiness, and retirement guidance.",
@@ -652,6 +659,42 @@ def _sources(*names: str) -> list[KnowledgeSource]:
         qa_guideline_files=["tenants/api_spec_review.md"],
         enable_routing=True,
     ),
+    TenantID.API_STEWARDSHIP_BOARD_QA_BOT: TenantConfig(
+        display_name="API Stewardship Board - General",
+        skill_name="api-stewardship-board",
+        scope="Data-plane API design and API Stewardship Board review guidance; advisory only, without approval authority.",
+        topics=[
+            "Data-plane REST and SDK design, endpoints, LROs, clients, packages, and naming",
+            "Internal API modeling, documentation/SDK exposure, and service-side access boundaries",
+            "Board review requests, readiness, async reviews, virtual Office Hours, and signoff process",
+            "REST versus SDK compatibility, preview/GA versioning, migration, and validation triage",
+            "API deprecation, retirement, affected versions, and customer-notification requirements",
+            "Safe review-scheduler troubleshooting and evidence-based operational referrals",
+        ],
+        exclusions=[
+            "ARM/management-plane reviews — direct to ARM Office Hours: https://armwiki.azurewebsites.net/introduction/office_hours.html",
+            "Detailed TypeSpec authoring or emitter failures — use the TypeSpec skill",
+            "Detailed spec PR check investigation — use the API Spec Review skill",
+            "Breaking-change exception requests — use the API Spec Review skill for the applicable authorized-reviewer process",
+            "Release-plan lifecycle — use the SDK Onboarding skill",
+            "Language-specific SDK failures — use the corresponding language skill",
+            "Performing approvals, approval-label changes, merges, scheduler repairs, or permission changes",
+        ],
+        sources=_sources(
+            SRC_AZURE_API_GUIDELINES,
+            SRC_TYPESPEC_DOCS,
+            SRC_TYPESPEC_AZURE_DOCS,
+            SRC_AZURE_SDK_GUIDELINES,
+            SRC_AZURE_SDK_DOCS_ENG,
+            SRC_AZURE_REST_API_SPECS_WIKI,
+            SRC_AZURE_REST_API_SPECS_DOCS,
+            SRC_AZURE_OPENAPI_DIFF_DOCS,
+            SRC_AZURE_AVOCADO_DOCS,
+        ),
+        qa_guideline_files=["tenants/api_stewardship_board.md"],
+        enable_routing=True,
+        enable_wiki_cross_document_pages=False,
+    ),
     TenantID.AZURE_MCP_SERVER: TenantConfig(
         display_name="Azure MCP Server",
         skill_name="azure-mcp-server",

@@ -15,6 +15,7 @@ parameters:
     values:
       - azure_sdk
       - azure_mcp_server
+      - api_stewardship_board
   - name: environment
     displayName: 'Target Environment'
     type: string

@@ -0,0 +1,50 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "logicAppName": {
+      "value": "api-stewardship-board-qabot-logicapp"
+    },
+    "workflowState": {
+      "value": "Disabled"
+    },
+    "teamsGroupId": {
+      "value": "1a10b50c-e870-4fe0-8483-bf5542a8d2d8"
+    },
+    "teamsChannelIds": {
+      "value": [
+        "19:3ebb18fded0e47938f998e196a52952f@thread.tacv2"
+      ]
+    },
+    "serverBaseUrl": {
+      "value": "https://azuresdkqabot-server-c8czabhzhweadwgu.westus2-01.azurewebsites.net"
+    },
+    "serverAudience": {
+      "value": "899da762-d510-48f2-911a-db9ea0cc41fd"
+    },
+    "serverIdentityResourceId": {
+      "value": "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.ManagedIdentity/userAssignedIdentities/azuresdkqabot-identity"
+    },
+    "botBaseUrl": {
+      "value": "https://azsdkqabot.azurewebsites.net"
+    },
+    "botAudience": {
+      "value": "ff836b38-c7d8-459a-a504-57b60b50b4eb"
+    },
+    "botIdentityResourceId": {
+      "value": "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.ManagedIdentity/userAssignedIdentities/azsdkqabot"
+    },
+    "teamsConnectionResourceId": {
+      "value": "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.Web/connections/teams"
+    },
+    "integrationAccountResourceId": {
+      "value": "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.Logic/integrationAccounts/azuresdkqabot-ia"
+    },
+    "userAssignedIdentities": {
+      "value": {
+        "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.ManagedIdentity/userAssignedIdentities/azsdkqabot": {},
+        "/subscriptions/a18897a6-7e44-457d-9260-f2854c0aca42/resourceGroups/azure-sdk-qa-bot/providers/Microsoft.ManagedIdentity/userAssignedIdentities/azuresdkqabot-identity": {}
+      }
+    }
+  }
+}
@@ -23,6 +23,7 @@
         "19:453ec446a66446589d764132f5cebb00@thread.tacv2",
         "19:037246b9968445edb3a23612ea44524d@thread.tacv2",
         "19:de16cb01a8a140678f02c3c1c8999756@thread.tacv2",
+        "19:17b23ff1d5d54cc293dcf673d32a5b7f@thread.tacv2",
         "19:a357180f469c484db6890d8e35fe6a76@thread.tacv2"
       ]
     },

@@ -22,6 +22,7 @@
         "19:rMhMrxg7UjfwZmVoSeVvWvNQIfT_G6ds8napsytWqzw1@thread.tacv2",
         "19:6adf8854b8bd4522ac917f1f5f21ff3c@thread.tacv2",
         "19:bba4931857074014b3d8f1fd10662b36@thread.tacv2",
+        "19:1897c1bd6c6145efb62167733e1b8c82@thread.tacv2",
         "19:9d05f1ee3cc2425ab86d4518f21fb1ec@thread.tacv2"
       ]
     },

@@ -12,6 +12,17 @@
       "type": "string",
       "defaultValue": "[resourceGroup().location]"
     },
+    "workflowState": {
+      "type": "string",
+      "defaultValue": "Enabled",
+      "allowedValues": [
+        "Enabled",
+        "Disabled"
+      ],
+      "metadata": {
+        "description": "Listener state; Board deployments default to Disabled"
+      }
+    },
     "teamsGroupId": {
       "type": "string",
       "metadata": {
@@ -90,7 +101,7 @@
         "userAssignedIdentities": "[parameters('userAssignedIdentities')]"
       },
       "properties": {
-        "state": "Enabled",
+        "state": "[parameters('workflowState')]",
         "integrationAccount": {
           "id": "[parameters('integrationAccountResourceId')]"
         },

@@ -0,0 +1,35 @@
+<!-- Copyright (c) Microsoft Corporation. -->
+<!-- Licensed under the MIT License. -->
+
+# Tenant: API Stewardship Board Assistant
+
+## Scope
+
+Help with data-plane API design and Board reviews. Give evidence-backed advice, not Board decisions. Do not repair infrastructure or prescribe resource-specific permission changes.
+
+Direct ARM/management-plane reviews to [ARM Office Hours](https://armwiki.azurewebsites.net/introduction/office_hours.html) and stop this Board review workflow.
+
+## 1. Understand the request
+
+Use the latest confirmed thread resolution; distinguish proposals from decisions and preserve withdrawals.
+
+## 2. Gather evidence
+
+Load `pr-review` for check diagnosis, feedback and merge readiness. Treat bot summaries as starting evidence; verify blockers against live current-head state.
+
+Retrieve maintained guidance for the unresolved question identified from the PR or request. Pass known `service_type="data-plane"` or `service_type="management-plane"` to `search_knowledge_base`, including the initial search; leave it unset when ambiguous or general. Use PR labels, paths or explicit wording, never the channel. `wiki_search` has no service-type filter.
+
+## 3. Apply the relevant policy
+
+As applicable:
+
+- Keep REST signoff, breaking-change exceptions, SDK/API review and package-name approval separate. Verify live `.github/protected-labels.yml` for approval authority; approval does not transfer to another PR.
+- Distinguish published-version edits from new versions, preview from GA, and REST from SDK compatibility. Verify the applicable baseline and policy; do not invent requirements for inaccessible material.
+- Separate SDK/documentation visibility from service authorization. Verify preview classification from policy and availability, not AFEC alone.
+- For retirement, verify affected versions, applicable notice requirements and approval evidence; do not generalize prior approvals.
+
+## 4. Recommend the next action
+
+Help the author take the next useful action from current evidence, rather than restart completed review work. Answer concisely; omit review checklists and repeated conclusions or links.
+
+Use maintained Board guidance for async reviews, materials, lead times, Office Hours and support. Do not send users back to this channel to repeat their question.
@@ -28,6 +28,9 @@
 
 # Short descriptions for system-prompt advertisement
 _SKILL_DESCRIPTIONS: dict[TenantID, str] = {
+    TenantID.API_STEWARDSHIP_BOARD_QA_BOT: (
+        "Data-plane API design and API Stewardship Board review guidance."
+    ),
     TenantID.API_SPEC_REVIEW_BOT: (
         "Azure REST API specification authoring and PR review: requirements, "
         "validation errors, LintDiff, Avocado, breaking changes, review status, "

@@ -163,6 +163,14 @@ def test_azure_mcp_internal_docs_are_scoped_to_mcp_title_tokens():
     )
 
 
+def test_stewardship_internal_docs_keep_source_scope_without_title_restrictions():
+    got = _resolve_source_filters(
+        [SRC_AZURE_SDK_DOCS_ENG], TenantID.API_STEWARDSHIP_BOARD_QA_BOT.value
+    )
+    assert got[SRC_AZURE_SDK_DOCS_ENG] == "context_id eq 'azure-sdk-docs-eng'"
+    assert _wiki_page_filters(TenantID.API_STEWARDSHIP_BOARD_QA_BOT.value, got) == got
+
+
 def test_combined_source_filters_keep_or_clauses_grouped():
     got = combine_source_filters(
         {