Merge branch 'main' into agents-mcp-skills

Author: Ankit Sinha

.github/workflows/pr.yml

@@ -221,22 +221,6 @@ jobs:
           
           echo "All skill files have valid frontmatter"
 
-      - name: Check skill name prefix conflicts
-        if: steps.changed-skills.outputs.any_changed == 'true'
-        run: |
-          # Collect toplevel skill directory names under plugin/skills
-          NAMES=$(ls -d plugin/skills/*/ | xargs -n1 basename)
-          
-          # Check if any name is a prefix of another
-          while IFS= read -r a; do
-            while IFS= read -r b; do
-              if [ "$a" != "$b" ] && [[ "$b" == "$a"* ]]; then
-                echo "error: Skill name '$a' is a prefix of '$b'"
-                exit 1
-              fi
-            done <<< "$NAMES"
-          done <<< "$NAMES"
-
       - name: Skip message
         if: steps.changed-skills.outputs.any_changed != 'true'
         run: echo "No skill files changed - skipping validation"

.github/workflows/test-all-integration.yml

@@ -110,12 +110,14 @@ jobs:
 
       - name: Integration tests - azure-ai
         id: integration-tests-azure-ai
-        if: contains(inputs.skills, 'azure-ai')
+        # works around the problem that azure-ai is a prefix of azure-aigateway
+        if: contains(format(',{0},', inputs.skills), ',azure-ai,')
         env:
           DEBUG: ${{ inputs.debug && '1' || '' }}
           TEST_RUN_ID: all-integration
         run: |
-          npm run test:integration azure-ai
+          # works around the problem that azure-ai is a prefix of azure-aigateway
+          npm run test:integration azure-ai/
         continue-on-error: true
 
       - name: Integration tests - azure-aigateway

.github/workflows/test-azure-deploy.yml

@@ -12,8 +12,8 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
-      group-name:
-        description: 'Deploy test group name to run (e.g. static-web-apps-deploy). If empty, all groups will be run.'
+      test-pattern:
+        description: 'Optional: Filter tests by name or describe block (e.g. "creates todo list", "static-web-apps-deploy", "Terraform"). If empty, all tests will be run.'
         required: false
         type: string
         default: ''
@@ -97,10 +97,11 @@ jobs:
           GH_HEAD_SHA: ${{ github.sha }}
           DEBUG: ${{ inputs.debug && '1' || '' }}
         run: |
-          if [ -n "${{ inputs.group-name }}" ]; then
-            TEST_ARGS="--testNamePattern=${{ inputs.group-name }}"
+          if [ -n "${{ inputs.test-pattern }}" ]; then
+            npm run test:integration -- --testPathPattern="azure-deploy" --testNamePattern="${{ inputs.test-pattern }}"
+          else
+            npm run test:integration -- --testPathPattern="azure-deploy"
           fi
-          npm run test:integration -- --testPathPattern="azure-deploy" $TEST_ARGS
         continue-on-error: true
 
       - name: Generate report

tests/AGENTS.md

@@ -237,7 +237,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   test('invokes skill for relevant prompt', async () => {
     const agentMetadata = await run({
       prompt: 'What role should I assign for blob storage access?'

tests/_template/integration.test.ts

@@ -27,7 +27,7 @@ const SKILL_NAME = "your-skill-name";
 // Use centralized skip logic from agent-runner
 const describeIntegration = shouldSkipIntegrationTests() ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   // Example test: Verify the skill is invoked for a relevant prompt

tests/appinsights-instrumentation/integration.test.ts

@@ -37,7 +37,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   describe("skill-invocation", () => {

tests/azure-ai/integration.test.ts

@@ -32,7 +32,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   describe("skill-invocation", () => {

tests/azure-aigateway/integration.test.ts

@@ -32,7 +32,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   describe("skill-invocation", () => {

tests/azure-compliance/integration.test.ts

@@ -32,7 +32,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   describe("skill-invocation", () => {

tests/azure-cost-optimization/integration.test.ts

@@ -33,7 +33,7 @@ if (skipTests && skipReason) {
 
 const describeIntegration = skipTests ? describe.skip : describe;
 
-describeIntegration(`${SKILL_NAME} - Integration Tests`, () => {
+describeIntegration(`${SKILL_NAME}_ - Integration Tests`, () => {
   const agent = useAgentRunner();
 
   describe("skill-invocation", () => {