Qiaoqiao Zhang (qiaozha) · Jun 30, 2026 · Jul 1, 2026 · Jul 1, 2026 · Jul 1, 2026 · Jul 1, 2026
@@ -0,0 +1,28 @@
+# Build context for the agent-server image (see Dockerfile).
+# Allowlist: ignore everything, then re-include only the paths the Dockerfile
+# COPYs. This keeps the `az acr build` upload minimal (excludes images/, tests/,
+# pipelines/, scripts/, tsp/, docs, dev deps, etc.).
+*
+
+!requirements.txt
+!agents/
+!agents/chat_agent/
+!config/
+!models/
+!prompts/
+!services/
+!static/
+!tools/
+!utils/
+!skills/
+!server.py
+!_version.py
+
+# Drop caches that may live inside the re-included directories.
+**/__pycache__
+**/*.pyc
+**/*.pyo
+**/.pytest_cache
+**/.mypy_cache
+**/.ruff_cache
+agents/chat_agent/chat_agent_env/
@@ -12,20 +12,22 @@ RUN tdnf install -y ca-certificates tar gzip git openssh-clients && \
     tdnf clean all
 
 # Install dependencies first (layer caching)
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/requirements.txt .
+# NOTE: paths are relative to the build context, which is the project directory
+# (tools/sdk-ai-bots/azure-sdk-qa-bot-agent), not the repository root.
+COPY requirements.txt .
 RUN pip install --no-cache-dir --pre --timeout ${PIP_DEFAULT_TIMEOUT} --retries ${PIP_RETRIES} -r requirements.txt
 
 # Copy application code
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/config/ ./config/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/models/ ./models/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/prompts/ ./prompts/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/services/ ./services/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/static/ ./static/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/tools/ ./tools/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/utils/ ./utils/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/skills/ ./skills/
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/server.py .
-COPY tools/sdk-ai-bots/azure-sdk-qa-bot-agent/_version.py .
+COPY config/ ./config/
+COPY models/ ./models/
+COPY prompts/ ./prompts/
+COPY services/ ./services/
+COPY static/ ./static/
+COPY tools/ ./tools/
+COPY utils/ ./utils/
+COPY skills/ ./skills/
+COPY server.py .
+COPY _version.py .
 
 EXPOSE 8089
 

@@ -1 +1,13 @@
 name: azure-sdk-chat-agent
+kind: hosted
+description: Hosted container agent using pre-built image placeholder.azurecr.io/agent:v1
+protocols:
+    - protocol: responses
+      version: 2.0.0
+# NOTE: the hosted agent container's AZURE_APPCONFIG_ENDPOINT env var is NOT set
+# here. azd's azure.ai.agents extension does not embed agent.yaml
+# `environment_variables` into the deployed version's container definition (its
+# "Registering agent environment variables" step is a no-op), so the container
+# would still boot without it and crash in app_config.init(). The env var is
+# injected reliably by deployment/hooks/agent-postdeploy.ts, which creates a
+# follow-up agent version with environment_variables embedded in the definition.
@@ -5,7 +5,7 @@ WORKDIR /app
 ENV PYTHONUNBUFFERED=1
 ENV ENABLE_INSTRUMENTATION=true
 
-ARG AZSDK_CLI_VERSION=0.6.3
+ARG AZSDK_CLI_VERSION=0.6.43
 ARG NODE_VERSION=22.12.0
 ARG ADO_MCP_VERSION=2.7.0
 

@@ -26,10 +26,9 @@ parameters:
 variables:
   - template: /eng/pipelines/templates/variables/globals.yml
   - template: /eng/pipelines/templates/variables/image.yml
-  - ${{ if eq(parameters.environment, 'dev') }}:
-    - group: 'Azure SDK QA Bot Dev Variables'
-  - ${{ if eq(parameters.environment, 'prod') }}:
-    - group: 'Azure SDK QA Bot Prod Variables'
+  - template: /tools/sdk-ai-bots/deployment/pipelines/templates/service-connection.yml
+    parameters:
+      environment: ${{ parameters.environment }}
   - name: workingDirectory
     value: '$(System.DefaultWorkingDirectory)/tools/sdk-ai-bots/azure-sdk-qa-bot-agent'
   - name: PythonIndexUrl
@@ -50,51 +49,7 @@ extends:
               image: $(LINUXVMIMAGE)
               os: linux
             steps:
-              - checkout: self
-                displayName: 'Checkout repository'
-
-              - task: PipAuthenticate@1
-                displayName: 'Authenticate pip to Azure Artifacts'
-                inputs:
-                  artifactFeeds: 'public/azure-sdk-for-python'
-
-              - task: AzureCLI@2
-                displayName: 'Build, Push & Deploy Agent'
-                inputs:
-                  azureSubscription: $(SERVICE_CONNECTION)
-                  scriptType: bash
-                  scriptLocation: inlineScript
-                  workingDirectory: $(workingDirectory)
-                  inlineScript: |
-                    set -euo pipefail
-
-                    if [ "${{ parameters.agentName }}" = "chatbot_evolution_agent" ] && [ "${{ parameters.environment }}" != "prod" ]; then
-                      echo "chatbot_evolution_agent is production-only."
-                      exit 1
-                    fi
-
-                    # Suppress Azure CLI welcome banner on fresh CI agents.
-                    export AZURE_CORE_WELCOME_MESSAGE=false
-                    az version > /dev/null 2>&1 || true
-                    az config set core.welcome_message=false 2>/dev/null || true
-
-                    python -m pip install --upgrade pip
-                    python -m pip install keyring artifacts-keyring --retries 5 --timeout 60
-
-                    python -m pip config set global.index-url "$PIP_INDEX_URL"
-
-                    pip install -r requirements.txt --retries 5 --timeout 60
-
-                    python scripts/deploy_hosted_agent.py \
-                      ${{ parameters.agentName }} \
-                      --tag "$(Build.BuildId)" \
-                      --appconfig-endpoint "$(AZURE_APPCONFIG_ENDPOINT)"
-                env:
-                  ENABLE_AI_FOUNDRY_AGENT_ROUTING: ${{ iif(eq(parameters.environment, 'dev'), 'true', 'false') }}
-                  AZURE_CORE_WELCOME_MESSAGE: 'false'
-                  AI_FOUNDRY_RAI_POLICY_ID: $(AI_FOUNDRY_RAI_POLICY_ID)
-                  AI_FOUNDRY_PROJECT_NAME: $(AI_FOUNDRY_PROJECT_NAME)
-                  ACR_NAME: $(ACR_NAME)
-                  ACR_RESOURCE_GROUP: $(ACR_RESOURCE_GROUP)
-                  CANDIDATE_APPCONFIG_ENDPOINT: $(CANDIDATE_APPCONFIG_ENDPOINT)
-                  SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+              - template: /tools/sdk-ai-bots/deployment/pipelines/templates/hosted-agent-deploy-steps.yml
+                parameters:
+                  agentName: ${{ parameters.agentName }}
+                  environment: ${{ parameters.environment }}
@@ -37,7 +37,9 @@ parameters:
 variables:
   - template: /eng/pipelines/templates/variables/globals.yml
   - template: /eng/pipelines/templates/variables/image.yml
-  - group: 'Azure SDK QA Bot Prod Variables'
+  - template: /tools/sdk-ai-bots/deployment/pipelines/templates/service-connection.yml
+    parameters:
+      environment: prod
   - name: workingDirectory
     value: '$(System.DefaultWorkingDirectory)/tools/sdk-ai-bots/azure-sdk-qa-bot-agent'
   - name: PythonIndexUrl
@@ -53,7 +55,7 @@ extends:
         jobs:
           - job: RunFeedbackJobs
             displayName: 'Run Feedback Jobs'
-            timeoutInMinutes: 120
+            timeoutInMinutes: 360
             pool:
               name: $(LINUXPOOL)
               image: $(LINUXVMIMAGE)
@@ -62,6 +64,10 @@ extends:
               - checkout: self
                 displayName: 'Checkout repository'
 
+              - template: /tools/sdk-ai-bots/deployment/pipelines/templates/load-environment-suite.yml
+                parameters:
+                  environment: prod
+
               - template: /eng/common/pipelines/templates/steps/login-to-github.yml
 
               - task: PipAuthenticate@1
@@ -72,7 +78,8 @@ extends:
               - task: AzureCLI@2
                 displayName: 'Run Feedback Job Scan'
                 inputs:
-                  azureSubscription: $(SERVICE_CONNECTION)
+                  azureSubscription: $(AZURE_SERVICE_CONNECTION)
+                  addSpnToEnvironment: true
                   scriptType: bash
                   scriptLocation: inlineScript
                   workingDirectory: $(workingDirectory)

@@ -115,11 +115,12 @@ extends:
                   inlineScript: |
                     set -euo pipefail
                     # Use remote ACR build to avoid hosted-agent network restrictions during pip install.
+                    # Build context is scoped to the project directory (not the repo root) to keep the upload small.
                     az acr build \
                       --registry "$(ACR_NAME)" \
                       --image "$(imageName):$(imageTag)" \
-                      --file "tools/sdk-ai-bots/azure-sdk-qa-bot-agent/Dockerfile" \
-                      "$(System.DefaultWorkingDirectory)"
+                      --file "$(workingDirectory)/Dockerfile" \
+                      "$(workingDirectory)"
                     ACR_LOGIN_SERVER=$(az acr show --name "$(ACR_NAME)" --resource-group "$(ACR_RESOURCE_GROUP)" --query loginServer -o tsv)
                     echo "Image pushed: $ACR_LOGIN_SERVER/$(imageName):$(imageTag)"
 

@@ -5,7 +5,6 @@ azure-appconfiguration==1.8.0
 azure-cosmos==4.9.0
 azure-identity==1.26.0b2
 azure-keyvault-keys==4.11.0
-azure-keyvault-secrets==4.9.0
 azure-storage-blob==12.29.0
 python-dotenv>=1.2.2
 pyyaml>=6.0.3

@@ -13,12 +13,15 @@
 
 import argparse
 import asyncio
+import json
 import os
 import re
 import subprocess
 import sys
 import time
 from pathlib import Path
+from urllib.parse import quote, urlparse
+from urllib.request import Request, urlopen
 
 os.environ.setdefault("AZURE_CORE_WELCOME_MESSAGE", "false")
 
@@ -70,6 +73,30 @@ def _git_short_sha() -> str:
         return "latest"
 
 
+def _qualify_rai_policy_id(
+    policy: str,
+    *,
+    subscription_id: str,
+    resource_group: str,
+    project_endpoint: str,
+) -> str:
+    if policy.lower().startswith("/subscriptions/"):
+        return policy
+
+    hostname = urlparse(project_endpoint).hostname or ""
+    ai_resource_name = hostname.split(".", 1)[0]
+    if not subscription_id or not resource_group or not ai_resource_name:
+        raise RuntimeError(
+            "Cannot qualify the RAI policy name; AZURE_SUBSCRIPTION_ID, "
+            "AZURE_RESOURCE_GROUP, and AI Foundry project endpoint are required."
+        )
+    return (
+        f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}"
+        f"/providers/Microsoft.CognitiveServices/accounts/{ai_resource_name}"
+        f"/raiPolicies/{policy}"
+    )
+
+
 def _wait_for_version_active(
     project: "AIProjectClient",
     agent_name: str,
@@ -113,6 +140,37 @@ def _wait_for_version_active(
     return False
 
 
+def _resolve_agent_principal_id(
+    project_endpoint: str,
+    agent_name: str,
+    agent_version: str,
+    credential: AzureCliCredential,
+) -> str:
+    """Resolve the managed identity assigned to a hosted agent version."""
+    token = credential.get_token("https://ai.azure.com/.default").token
+    endpoint = (
+        f"{project_endpoint.rstrip('/')}/agents/{quote(agent_name, safe='')}"
+        f"/versions/{quote(agent_version, safe='')}?api-version=2025-05-15-preview"
+    )
+    last_error = "identity was not returned"
+    for _ in range(10):
+        try:
+            request = Request(endpoint, headers={"Authorization": f"Bearer {token}"})
+            with urlopen(request, timeout=60) as response:
+                body = json.load(response)
+            identity = body.get("instance_identity") or body.get("instanceIdentity") or {}
+            principal_id = identity.get("principal_id") or identity.get("principalId")
+            if principal_id:
+                return str(principal_id)
+            last_error = "instance identity has no principal ID"
+        except Exception as exc:
+            last_error = str(exc)
+        time.sleep(15)
+    raise RuntimeError(
+        f"Could not resolve the runtime identity for {agent_name} v{agent_version}: {last_error}"
+    )
+
+
 def main() -> None:
     parser = argparse.ArgumentParser(
         description="Build, push, and deploy a hosted agent."
@@ -259,15 +317,23 @@ def main() -> None:
             "ENABLE_INSTRUMENTATION": "true",
             "APP_VERSION": next_version,
         }
-        if candidate_appconfig_endpoint:
+        if args.agent_name == "chatbot_evolution_agent":
             env_vars["CANDIDATE_APPCONFIG_ENDPOINT"] = candidate_appconfig_endpoint
 
         # Ensure Content-safety guardrail.
-        rai_policy_id = os.environ.get("AI_FOUNDRY_RAI_POLICY_ID", "")
+        rai_policy_id = os.environ.get("AI_FOUNDRY_RAI_POLICY_ID") or cfg(
+            "AI_FOUNDRY_RAI_POLICY_ID"
+        )
         if not rai_policy_id:
             raise RuntimeError(
                 "Cannot apply guardrail because AI_FOUNDRY_RAI_POLICY_ID is not set."
             )
+        rai_policy_id = _qualify_rai_policy_id(
+            rai_policy_id,
+            subscription_id=sub_id,
+            resource_group=os.environ.get("AZURE_RESOURCE_GROUP", ""),
+            project_endpoint=project_endpoint,
+        )
         rai_config = RaiConfig(rai_policy_name=rai_policy_id)
         print(f"  Guardrail: {rai_policy_id}")
 
@@ -312,6 +378,22 @@ def main() -> None:
                 f'--url "{project_endpoint}/agents/{agent.name}/versions/{agent_version}" '
                 '--resource "https://ai.azure.com"'
             )
+
+        principal_id = _resolve_agent_principal_id(
+            project_endpoint,
+            agent.name,
+            agent_version,
+            credential,
+        )
+        print(f"Runtime identity: {principal_id}")
+        print(
+            "##vso[task.setvariable variable=HOSTED_AGENT_PRINCIPAL_ID]"
+            f"{principal_id}"
+        )
+        print(
+            "##vso[task.setvariable variable=HOSTED_AGENT_VERSION]"
+            f"{agent_version}"
+        )
     finally:
         project.close()
         credential.close()

@@ -0,0 +1,32 @@
+"""Tests for hosted-agent deployment helpers."""
+
+from scripts.deploy_hosted_agent import _qualify_rai_policy_id
+
+
+def test_qualifies_short_rai_policy_name() -> None:
+    assert _qualify_rai_policy_id(
+        "Microsoft.DefaultV2",
+        subscription_id="00000000-0000-0000-0000-000000000001",
+        resource_group="qabot-dev",
+        project_endpoint=(
+            "https://qabot-ai.services.ai.azure.com/api/projects/qabot"
+        ),
+    ) == (
+        "/subscriptions/00000000-0000-0000-0000-000000000001"
+        "/resourceGroups/qabot-dev/providers/Microsoft.CognitiveServices"
+        "/accounts/qabot-ai/raiPolicies/Microsoft.DefaultV2"
+    )
+
+
+def test_preserves_qualified_rai_policy_id() -> None:
+    policy_id = (
+        "/subscriptions/00000000-0000-0000-0000-000000000001"
+        "/resourceGroups/qabot-dev/providers/Microsoft.CognitiveServices"
+        "/accounts/qabot-ai/raiPolicies/custom"
+    )
+    assert _qualify_rai_policy_id(
+        policy_id,
+        subscription_id="ignored",
+        resource_group="ignored",
+        project_endpoint="https://ignored",
+    ) == policy_id