Fix Foreach body exit wiring in declarative workflows

2026-06-16 21:04:09 +08:00 · 2026-05-22 15:19:36 -07:00
691 changed files with 15493 additions and 46139 deletions
@@ -1,19 +1,15 @@
 {
  "name": "Python 3",
-  "image": "mcr.microsoft.com/devcontainers/python:3.14-bookworm",
+  "image": "mcr.microsoft.com/devcontainers/python:3.13-bullseye",
  "features": {
    "ghcr.io/va-h/devcontainers-features/uv:1": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:3": {},
-    "ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
-    "ghcr.io/devcontainers/features/copilot-cli:1": {}
+    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {}
  },
  "postCreateCommand": "bash ./devsetup.sh",
  "workspaceFolder": "/workspaces/agent-framework/python/",
  "customizations": {
    "vscode": {
      "extensions": [
-        "GitHub.copilot",
-        "GitHub.vscode-github-actions",
        "ms-python.python",
        "ms-windows-ai-studio.windows-ai-studio",
        "littlefoxteam.vscode-python-test-adapter"
@@ -8,7 +8,7 @@ ignorePatterns:
  - pattern: "./blob"
  - pattern: "./issues"
  - pattern: "./discussions"
-  - pattern: "./pull"
+  - pattern: "./pulls"
  - pattern: "https:\/\/platform.openai.com"
  - pattern: "http:\/\/localhost"
  - pattern: "http:\/\/127.0.0.1"
@@ -1,64 +0,0 @@
-name: Free runner disk space
-description: |
-  Reclaims disk space on GitHub-hosted Ubuntu runners by removing
-  pre-installed toolchains we do not use (Android SDK, GHC/Haskell,
-  CodeQL bundle), Docker images, and swap. Also relocates the
-  NuGet package cache to /mnt (which has ~75 GB free vs ~14 GB
-  on /). No-op on non-Linux runners.
-
-runs:
-  using: composite
-  steps:
-    - name: Free disk space (Linux only)
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        set -euo pipefail
-        echo "::group::Disk usage before cleanup"
-        df -h /
-        echo "::endgroup::"
-
-        # Remove pre-installed toolchains we never use on this repo's
-        # dotnet/python jobs. These reclaim ~25-30 GB on ubuntu-latest.
-        sudo rm -rf \
-          /usr/local/lib/android \
-          /usr/share/dotnet/sdk/NuGetFallbackFolder \
-          /opt/ghc \
-          /usr/local/.ghcup \
-          /opt/hostedtoolcache/CodeQL \
-          /opt/hostedtoolcache/PyPy \
-          /opt/hostedtoolcache/Ruby \
-          /opt/hostedtoolcache/go \
-          /usr/local/share/boost \
-          /usr/local/share/powershell \
-          /usr/local/share/chromium \
-          /usr/local/share/vcpkg \
-          /usr/local/lib/heroku \
-          "${AGENT_TOOLSDIRECTORY:-/opt/hostedtoolcache}/PyPy" \
-          "${AGENT_TOOLSDIRECTORY:-/opt/hostedtoolcache}/Ruby" \
-          "${AGENT_TOOLSDIRECTORY:-/opt/hostedtoolcache}/go" || true
-
-        # Drop docker images shipped on the runner; jobs that need
-        # docker pull what they need fresh.
-        if command -v docker >/dev/null 2>&1; then
-          sudo docker image prune --all --force >/dev/null 2>&1 || true
-        fi
-
-        # Disable swap to free its backing file.
-        sudo swapoff -a || true
-        sudo rm -f /mnt/swapfile /swapfile || true
-
-        echo "::group::Disk usage after cleanup"
-        df -h /
-        echo "::endgroup::"
-
-    - name: Relocate NuGet package cache to /mnt (Linux only)
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        set -euo pipefail
-        sudo mkdir -p /mnt/nuget
-        sudo chown -R "$USER":"$USER" /mnt/nuget
-        echo "NUGET_PACKAGES=/mnt/nuget" >> "$GITHUB_ENV"
-        echo "Relocated NuGet package cache to /mnt/nuget"
-        df -h /mnt || true
@@ -1,181 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-function getPullRequest(context) {
-  const pullRequest = context.payload.pull_request;
-  if (!pullRequest?.number || !pullRequest.user?.login) {
-    throw new Error('This script must be run from a pull_request_target event.');
-  }
-
-  return {
-    author: pullRequest.user.login,
-    authorType: pullRequest.user.type,
-    labels: pullRequest.labels?.map((label) => label.name).filter(Boolean) ?? [],
-    number: pullRequest.number,
-  };
-}
-
-async function ensureLabel({ github, owner, repo, labelName }) {
-  try {
-    await github.rest.issues.getLabel({
-      owner,
-      repo,
-      name: labelName,
-    });
-  } catch (error) {
-    if (error.status !== 404) {
-      throw error;
-    }
-
-    try {
-      await github.rest.issues.createLabel({
-        owner,
-        repo,
-        name: labelName,
-        color: 'd93f0b',
-        description: 'Community author has exceeded the open pull request limit.',
-      });
-    } catch (createError) {
-      if (createError.status !== 422) {
-        throw createError;
-      }
-    }
-  }
-}
-
-function hasLabel(labels, labelName) {
-  if (!labelName) {
-    return false;
-  }
-
-  return labels.some((label) => label.toLowerCase() === labelName.toLowerCase());
-}
-
-function isDependabotAuthor({ author, authorType }) {
-  return authorType === 'Bot' && author.toLowerCase() === 'dependabot[bot]';
-}
-
-function buildLimitMessage({ author, exemptLabelName, maxOpenPrs, openPrCount }) {
-  return [
-    `Thank you for your contribution, @${author}.`,
-    '',
-    `To keep the review queue manageable, we currently limit community contributors to ${maxOpenPrs} `
-      + `open pull requests at a time. This PR would put you at ${openPrCount} open pull requests, `
-      + 'so we are closing it automatically.',
-    '',
-    'Please focus on getting your existing PRs reviewed, merged, or closed before opening another one. '
-      + `If a maintainer asked you to open this PR, they can apply the \`${exemptLabelName}\` label and reopen it.`,
-  ].join('\n');
-}
-
-async function getOpenPrCount({ github, owner, repo, author, pullRequestNumber }) {
-  const openPullRequests = await github.paginate(github.rest.pulls.list, {
-    owner,
-    repo,
-    state: 'open',
-    per_page: 100,
-  });
-
-  const authorOpenPullRequestNumbers = openPullRequests
-    .filter((pullRequest) => pullRequest.user?.login === author)
-    .map((pullRequest) => pullRequest.number);
-  const currentPrIsOpen = authorOpenPullRequestNumbers.includes(pullRequestNumber);
-  const existingOpenPrCount = currentPrIsOpen
-    ? authorOpenPullRequestNumbers.length - 1
-    : authorOpenPullRequestNumbers.length;
-
-  return existingOpenPrCount + 1;
-}
-
-async function enforcePrLimit({ github, context, core, exemptLabelName, maxOpenPrs, labelName }) {
-  const { owner, repo } = context.repo;
-  const { author, authorType, labels, number } = getPullRequest(context);
-
-  if (isDependabotAuthor({ author, authorType })) {
-    core.info(`Author ${author} is Dependabot; skipping open PR limit enforcement.`);
-    return {
-      author,
-      closed: false,
-      dependabotExempt: true,
-      openPrCount: null,
-    };
-  }
-
-  if (hasLabel(labels, exemptLabelName)) {
-    core.info(`PR #${number} has the ${exemptLabelName} label; skipping open PR limit enforcement.`);
-    return {
-      author,
-      closed: false,
-      exempt: true,
-      openPrCount: null,
-    };
-  }
-
-  const openPrCount = await getOpenPrCount({
-    github,
-    owner,
-    repo,
-    author,
-    pullRequestNumber: number,
-  });
-
-  if (openPrCount <= maxOpenPrs) {
-    core.info(
-      `${author} has ${openPrCount} open pull request(s), which is within the limit of ${maxOpenPrs}.`,
-    );
-    return {
-      author,
-      closed: false,
-      openPrCount,
-    };
-  }
-
-  await ensureLabel({
-    github,
-    owner,
-    repo,
-    labelName,
-  });
-
-  await github.rest.issues.addLabels({
-    owner,
-    repo,
-    issue_number: number,
-    labels: [labelName],
-  });
-
-  await github.rest.issues.createComment({
-    owner,
-    repo,
-    issue_number: number,
-    body: buildLimitMessage({
-      author,
-      exemptLabelName,
-      maxOpenPrs,
-      openPrCount,
-    }),
-  });
-
-  await github.rest.pulls.update({
-    owner,
-    repo,
-    pull_number: number,
-    state: 'closed',
-  });
-
-  core.info(
-    `${author} has ${openPrCount} open pull request(s), which exceeds the limit of ${maxOpenPrs}. `
-      + `Closed PR #${number}.`,
-  );
-
-  return {
-    author,
-    closed: true,
-    openPrCount,
-  };
-}
-
-module.exports = {
-  buildLimitMessage,
-  enforcePrLimit,
-  getOpenPrCount,
-};
@@ -1,341 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-/**
- * Tests for pr_limit_moderation.js.
- *
- * Run with: node --test .github/tests/test_pr_limit_moderation.js
- */
-
-const { describe, it } = require('node:test');
-const assert = require('node:assert/strict');
-
-const { enforcePrLimit } = require('../scripts/pr_limit_moderation.js');
-
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function createContext({ author = 'community-user', authorType = 'User', labels = [], number = 123 } = {}) {
-  return {
-    repo: {
-      owner: 'microsoft',
-      repo: 'agent-framework',
-    },
-    payload: {
-      pull_request: {
-        number,
-        labels: labels.map((name) => ({ name })),
-        user: {
-          login: author,
-          type: authorType,
-        },
-      },
-    },
-  };
-}
-
-function createCore() {
-  const messages = [];
-  return {
-    messages,
-    info(message) {
-      messages.push(message);
-    },
-  };
-}
-
-function createGithub({
-  itemNumbers,
-  labelExists = true,
-  pullRequests = createPullRequestPage({ numbers: itemNumbers }),
-}) {
-  const calls = [];
-
-  return {
-    calls,
-    async paginate(method, params) {
-      calls.push({ api: 'paginate', method, params });
-      return pullRequests;
-    },
-    rest: {
-      issues: {
-        async getLabel(params) {
-          calls.push({ api: 'issues.getLabel', params });
-          if (!labelExists) {
-            const error = new Error('Not Found');
-            error.status = 404;
-            throw error;
-          }
-          return { data: { name: params.name } };
-        },
-        async createLabel(params) {
-          calls.push({ api: 'issues.createLabel', params });
-          return { data: { name: params.name } };
-        },
-        async addLabels(params) {
-          calls.push({ api: 'issues.addLabels', params });
-          return { data: [] };
-        },
-        async createComment(params) {
-          calls.push({ api: 'issues.createComment', params });
-          return { data: { id: 1 } };
-        },
-      },
-      pulls: {
-        async list(params) {
-          calls.push({ api: 'pulls.list', params });
-          return { data: pullRequests };
-        },
-        async update(params) {
-          calls.push({ api: 'pulls.update', params });
-          return { data: { state: params.state } };
-        },
-      },
-    },
-  };
-}
-
-function createPullRequestPage({ author = 'community-user', numbers }) {
-  return numbers.map((number) => ({
-    number,
-    user: {
-      login: author,
-    },
-  }));
-}
-
-
-// ---------------------------------------------------------------------------
-// PR limit enforcement
-// ---------------------------------------------------------------------------
-
-describe('PR limit enforcement', () => {
-  it('does not close the PR when the author is at the open PR limit', async () => {
-    const github = createGithub({
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 123],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.openPrCount, 10);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      ['paginate'],
-    );
-  });
-
-  it('counts the new PR when the pull list includes it', async () => {
-    const github = createGithub({
-      itemNumbers: [123, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 11);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'paginate',
-        'issues.getLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('counts the current PR on top of existing open PRs', async () => {
-    const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 24 }, (_, index) => index + 1)],
-      pullRequests: createPullRequestPage({
-        numbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      }),
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 26);
-    const comment = github.calls.find((call) => call.api === 'issues.createComment').params.body;
-    assert.match(comment, /This PR would put you at 26 open pull requests/);
-  });
-
-  it('creates the label when it does not already exist', async () => {
-    const github = createGithub({
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      labelExists: false,
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'paginate',
-        'issues.getLabel',
-        'issues.createLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-    assert.equal(
-      github.calls.find((call) => call.api === 'issues.createLabel').params.name,
-      'too-many-prs',
-    );
-  });
-
-  it('tolerates a 422 race when creating the label', async () => {
-    const github = createGithub({
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      labelExists: false,
-    });
-    github.rest.issues.createLabel = async (params) => {
-      github.calls.push({ api: 'issues.createLabel', params });
-      const error = new Error('Validation Failed');
-      error.status = 422;
-      throw error;
-    };
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'paginate',
-        'issues.getLabel',
-        'issues.createLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('uses a diplomatic close message with the configured limit', async () => {
-    const github = createGithub({
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      pullRequests: createPullRequestPage({
-        author: 'octo-contributor',
-        numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      }),
-    });
-
-    await enforcePrLimit({
-      github,
-      context: createContext({ author: 'octo-contributor' }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    const comment = github.calls.find((call) => call.api === 'issues.createComment').params.body;
-    assert.match(comment, /Thank you for your contribution/);
-    assert.match(comment, /limit community contributors to 10 open pull requests/);
-    assert.match(comment, /@octo-contributor/);
-    assert.match(comment, /`pr-limit-exempt` label and reopen/);
-  });
-
-  it('does not close an exempt PR when it is reopened', async () => {
-    const github = createGithub({
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ labels: ['PR-LIMIT-EXEMPT'] }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.exempt, true);
-    assert.equal(result.openPrCount, null);
-    assert.deepEqual(github.calls, []);
-  });
-
-  it('does not close Dependabot PRs', async () => {
-    const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      pullRequests: createPullRequestPage({
-        author: 'dependabot[bot]',
-        numbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      }),
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ author: 'dependabot[bot]', authorType: 'Bot' }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.dependabotExempt, true);
-    assert.equal(result.openPrCount, null);
-    assert.deepEqual(github.calls, []);
-  });
-
-  it('counts the current PR when the author has more than one page of open PRs', async () => {
-    const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 100 }, (_, index) => index + 1)],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ number: 123 }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 101);
-  });
-});
@@ -121,9 +121,6 @@ jobs:
              python
              declarative-agents

-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
      - name: Setup dotnet
        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
        with:
@@ -194,9 +191,6 @@ jobs:
              python
              declarative-agents

-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
      # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
      - name: Start Azure Cosmos DB Emulator
        if: ${{ runner.os == 'Windows' && (needs.paths-filter.outputs.cosmosDbChanges == 'true' || (github.event_name != 'pull_request' && matrix.integration-tests)) }}
@@ -371,9 +365,6 @@ jobs:
            dotnet
            python

-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
      - name: Setup dotnet
        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
        with:
@@ -461,9 +452,6 @@ jobs:
            python
            declarative-agents

-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
      - name: Setup dotnet
        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
        with:
@@ -1,83 +0,0 @@
-name: Limit community pull requests
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: pr-limit-${{ github.repository }}-${{ github.event.pull_request.user.login }}
-  cancel-in-progress: false
-
-env:
-  MAX_OPEN_PULL_REQUESTS: '10'
-  PR_LIMIT_EXEMPT_LABEL: pr-limit-exempt
-  TOO_MANY_PRS_LABEL: too-many-prs
-
-jobs:
-  team_check:
-    runs-on: ubuntu-latest
-    outputs:
-      is_team_member: ${{ steps.check.outputs.is_team_member }}
-    steps:
-      - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          sparse-checkout: .github/scripts
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: Check PR author team membership
-        id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        env:
-          TEAM_NAME: ${{ secrets.DEVELOPER_TEAM }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        with:
-          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
-          script: |
-            const checkTeamMembership = require('./.github/scripts/check_team_membership.js');
-            const { author, isTeamMember } = await checkTeamMembership({
-              github,
-              context,
-              core,
-              teamSlug: process.env.TEAM_NAME,
-              issueNumber: process.env.PR_NUMBER,
-            });
-            core.setOutput('is_team_member', isTeamMember ? 'true' : 'false');
-            if (isTeamMember) {
-              core.info(`Author ${author} is a team member; skipping open PR limit.`);
-            } else {
-              core.info(`Author ${author} is not a team member; checking open PR limit.`);
-            }
-
-  limit_open_prs:
-    runs-on: ubuntu-latest
-    needs: team_check
-    if: ${{ needs.team_check.outputs.is_team_member == 'false' }}
-    steps:
-      - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          sparse-checkout: .github/scripts
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: Enforce open PR limit
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        with:
-          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
-          script: |
-            const { enforcePrLimit } = require('./.github/scripts/pr_limit_moderation.js');
-            await enforcePrLimit({
-              github,
-              context,
-              core,
-              exemptLabelName: process.env.PR_LIMIT_EXEMPT_LABEL,
-              maxOpenPrs: Number.parseInt(process.env.MAX_OPEN_PULL_REQUESTS, 10),
-              labelName: process.env.TOO_MANY_PRS_LABEL,
-            });
@@ -23,14 +23,6 @@ jobs:
        with:
          persist-credentials: false

-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install Chrome for Puppeteer
-        run: npx puppeteer browsers install chrome
-
      # Checks the status of hyperlinks in all files
      - name: Run linkspector
        uses: umbrelladocs/action-linkspector@963b6264d7de32c904942a70b488d3407453049e # v1
@@ -474,45 +474,6 @@ jobs:
          path: ./python/pytest.xml
          if-no-files-found: ignore

-  # GitHub Copilot integration tests
-  python-tests-github-copilot:
-    name: Python Integration Tests - GitHub Copilot
-    runs-on: ubuntu-latest
-    environment: integration
-    timeout-minutes: 60
-    env:
-      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-      GITHUB_COPILOT_TIMEOUT: "120"
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ inputs.checkout-ref }}
-          persist-credentials: false
-      - name: Set up python and install the project
-        id: python-setup
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Test with pytest (GitHub Copilot integration)
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/github_copilot/tests
-          -m integration
-          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-github-copilot
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
  # Integration test trend report (aggregates per-job JUnit XML results)
  python-integration-test-report:
    name: Integration Test Report
@@ -529,7 +490,6 @@ jobs:
        python-tests-foundry,
        python-tests-foundry-hosting,
        python-tests-cosmos,
-        python-tests-github-copilot,
      ]
    runs-on: ubuntu-latest
    defaults:
@@ -593,8 +553,7 @@ jobs:
        python-tests-functions,
        python-tests-foundry,
        python-tests-foundry-hosting,
-        python-tests-cosmos,
-        python-tests-github-copilot
+        python-tests-cosmos
      ]
    steps:
      - name: Fail workflow if tests failed
@@ -40,7 +40,6 @@ jobs:
      foundryChanged: ${{ steps.filter.outputs.foundry }}
      foundryHostingChanged: ${{ steps.filter.outputs.foundry_hosting }}
      cosmosChanged: ${{ steps.filter.outputs.cosmos }}
-      githubCopilotChanged: ${{ steps.filter.outputs.github_copilot }}
    steps:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
@@ -86,8 +85,6 @@ jobs:
              - 'python/packages/foundry_hosting/**'
            cosmos:
              - 'python/packages/azure-cosmos/**'
-            github_copilot:
-              - 'python/packages/github_copilot/**'
      # run only if 'python' files were changed
      - name: python tests
        if: steps.filter.outputs.python == 'true'
@@ -661,58 +658,6 @@ jobs:
          path: ./python/pytest.xml
          if-no-files-found: ignore

-  # GitHub Copilot integration tests
-  python-tests-github-copilot:
-    name: Python Tests - GitHub Copilot Integration
-    needs: paths-filter
-    if: >
-      github.event_name != 'pull_request' &&
-      needs.paths-filter.outputs.pythonChanges == 'true' &&
-      (github.event_name != 'merge_group' ||
-       needs.paths-filter.outputs.githubCopilotChanged == 'true' ||
-       needs.paths-filter.outputs.coreChanged == 'true')
-    runs-on: ubuntu-latest
-    environment: integration
-    timeout-minutes: 60
-    env:
-      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-      GITHUB_COPILOT_TIMEOUT: "120"
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - name: Set up python and install the project
-        id: python-setup
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Test with pytest (GitHub Copilot integration)
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/github_copilot/tests
-          -m integration
-          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
-      - name: Surface failing tests
-        if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
-        with:
-          path: ./python/pytest.xml
-          summary: true
-          display-options: fEX
-          fail-on-empty: false
-          title: GitHub Copilot integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-github-copilot
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
  # Integration test trend report (aggregates per-job JUnit XML results)
  python-integration-test-report:
    name: Integration Test Report
@@ -729,7 +674,6 @@ jobs:
        python-tests-foundry,
        python-tests-foundry-hosting,
        python-tests-cosmos,
-        python-tests-github-copilot,
      ]
    runs-on: ubuntu-latest
    defaults:
@@ -791,7 +735,6 @@ jobs:
        python-tests-foundry,
        python-tests-foundry-hosting,
        python-tests-cosmos,
-        python-tests-github-copilot,
      ]
    steps:
      - name: Fail workflow if tests failed
@@ -8,7 +8,6 @@ on:

 permissions:
  contents: read
-  actions: read
  pull-requests: write

 jobs:
@@ -24,7 +23,7 @@ jobs:
      - name: Download coverage report
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
        with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
          run-id: ${{ github.event.workflow_run.id }}
          path: ./python
          merge-multiple: true
@@ -39,9 +38,9 @@ jobs:
            echo "PR number file 'pr_number' is missing or empty"
            exit 1
          fi
-          PR_NUMBER=$(cat pr_number)
-          if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
-            echo "::error::PR number file contains invalid content"
+          PR_NUMBER=$(head -1 pr_number | tr -dc '0-9')
+          if [ -z "$PR_NUMBER" ]; then
+            echo "PR number file 'pr_number' does not contain a valid PR number"
            exit 1
          fi
          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
@@ -49,7 +48,7 @@ jobs:
        id: coverageComment
        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4 # v1.6.0
        with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
          issue-number: ${{ env.PR_NUMBER }}
          pytest-xml-coverage-path: python/python-coverage.xml
          title: "Python Test Coverage Report"
@@ -248,4 +248,3 @@ dotnet/filtered-*.slnx
 .omx/

 **/issues/
-.test_*
@@ -1,17 +1,17 @@
-# Support
-
-## How to file issues and get help  
-
-This project uses GitHub Issues to track bugs and feature requests. Please search the existing 
-issues before filing new issues to avoid duplicates.  For new issues, file your bug or 
-feature request as a new Issue.
-
-For help and questions about using this project, please create a GitHub issue.
-
-AI Support team will support Microsoft Agent Framework issues for customers under a **Unified support agreement when the issue arises from usage of Azure AI services** (Foundry Models, Foundry Agents etc.) in conjunction with the SDK. Conversely, if customer has any other / non unified support agreement and/or Agent Framework SDK is used in a way **not involving an Azure service**, it is treated as a purely open-source tool – Microsoft’s support organization will not handle it, and users should use GitHub or forums for assistance
-
-For Copilot Studio SDK implementation issues, customers should use GitHub Issues for assistance, as outlined above. Conversely, for prerequisites managed within the Copilot Studio portal, customers can rely on the standard Microsoft Copilot Studio support channels.
-
-## Microsoft Support Policy  
-
-Support for this **PROJECT or PRODUCT** is limited to the resources listed above.
+# Support
+
+## How to file issues and get help  
+
+This project uses GitHub Issues to track bugs and feature requests. Please search the existing 
+issues before filing new issues to avoid duplicates.  For new issues, file your bug or 
+feature request as a new Issue.
+
+For help and questions about using this project, please create a GitHub issue.
+
+AI Support team will support Microsoft Agent Framework issues for customers under a **Unified support agreement when the issue arises from usage of Azure AI services** (Foundry Models, Foundry Agents etc.) in conjunction with the SDK. Conversely, if customer has any other / non unified support agreement and/or Agent Framework SDK is used in a way **not involving an Azure service**, it is treated as a purely open-source tool – Microsoft’s support organization will not handle it, and users should use GitHub or forums for assistance
+
+For Copilot Studio SDK implementation issues, customers should use GitHub Issues for assistance, as outlined above. Conversely, for prerequisites managed within the Copilot Studio portal, customers can rely on the standard Microsoft Copilot Studio support channels.
+
+## Microsoft Support Policy  
+
+Support for this **PROJECT or PRODUCT** is limited to the resources listed above.
@@ -1,55 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M163.006 36.0262C155.129 31.4785 145.424 31.4759 137.533 36.0284L104.002 55.3877C107.838 53.2763 112.07 52.2274 116.296 52.2248C120.633 52.2231 124.976 53.3247 128.871 55.5411L174.091 81.6479C175.11 82.2362 175.738 83.3236 175.738 84.5004V151.263C175.738 152.716 177.313 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.7299C209.704 68.6342 204.855 60.227 196.967 55.6697L190.983 52.2141C190.65 52.0008 190.313 51.7921 189.969 51.5933L163.006 36.0262Z" fill="url(#paint0_linear_481_4810)"/>
-<path d="M163.006 36.0262C155.129 31.4785 145.424 31.4759 137.533 36.0284L104.002 55.3877C107.838 53.2763 112.07 52.2274 116.296 52.2248C120.633 52.2231 124.976 53.3247 128.871 55.5411L174.091 81.6479C175.11 82.2362 175.738 83.3236 175.738 84.5004V151.263C175.738 152.716 177.313 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.7299C209.704 68.6342 204.855 60.227 196.967 55.6697L190.983 52.2141C190.65 52.0008 190.313 51.7921 189.969 51.5933L163.006 36.0262Z" fill="url(#paint1_linear_481_4810)"/>
-<path d="M103.548 55.6397L103.557 55.6451L104.002 55.3877C103.851 55.471 103.698 55.5531 103.548 55.6397Z" fill="url(#paint2_linear_481_4810)"/>
-<path d="M103.548 55.6397L103.557 55.6451L104.002 55.3877C103.851 55.471 103.698 55.5531 103.548 55.6397Z" fill="url(#paint3_linear_481_4810)"/>
-<path d="M116.308 52.2209C111.903 52.2271 107.507 53.3498 103.561 55.6366C95.6702 60.1891 90.8239 68.6019 90.8231 77.6986L90.8223 167.846C90.8222 169.786 92.871 171.041 94.599 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9894C124.778 58.6476 129.49 55.9209 133.25 58.0698L128.879 55.5453C124.976 53.3242 120.645 52.2192 116.308 52.2209Z" fill="url(#paint4_linear_481_4810)"/>
-<path d="M95.3068 221.682C103.184 226.23 112.889 226.232 120.78 221.68L154.311 202.32C150.475 204.432 146.243 205.481 142.018 205.483C137.68 205.485 133.337 204.383 129.442 202.167L84.2226 176.06C83.2035 175.472 82.5757 174.384 82.5757 173.208L82.5757 106.445C82.5757 104.992 81 104.087 79.7451 104.813L61.3465 115.428C53.4682 119.976 48.6091 128.382 48.6089 137.487L48.6089 179.978C48.6089 189.074 53.4585 197.481 61.3465 202.038L67.3303 205.494C67.6629 205.707 68.0002 205.916 68.3446 206.115L95.3068 221.682Z" fill="url(#paint5_linear_481_4810)"/>
-<path d="M95.3068 221.682C103.184 226.23 112.889 226.232 120.78 221.68L154.311 202.32C150.475 204.432 146.243 205.481 142.018 205.483C137.68 205.485 133.337 204.383 129.442 202.167L84.2226 176.06C83.2035 175.472 82.5757 174.384 82.5757 173.208L82.5757 106.445C82.5757 104.992 81 104.087 79.7451 104.813L61.3465 115.428C53.4682 119.976 48.6091 128.382 48.6089 137.487L48.6089 179.978C48.6089 189.074 53.4585 197.481 61.3465 202.038L67.3303 205.494C67.6629 205.707 68.0002 205.916 68.3446 206.115L95.3068 221.682Z" fill="url(#paint6_linear_481_4810)"/>
-<path d="M154.765 202.068L154.756 202.063L154.311 202.32C154.463 202.237 154.615 202.155 154.765 202.068Z" fill="url(#paint7_linear_481_4810)"/>
-<path d="M154.765 202.068L154.756 202.063L154.311 202.32C154.463 202.237 154.615 202.155 154.765 202.068Z" fill="url(#paint8_linear_481_4810)"/>
-<path d="M142.003 205.487C146.408 205.481 150.805 204.358 154.751 202.071C162.641 197.519 167.488 189.106 167.488 180.009L167.489 89.8618C167.489 87.9222 165.44 86.667 163.712 87.5479L154.788 92.0972C141.739 98.7494 133.523 112.159 133.523 126.806L133.523 194.719C133.533 199.06 128.821 201.787 125.061 199.638L129.432 202.163C133.336 204.384 137.666 205.489 142.003 205.487Z" fill="url(#paint9_linear_481_4810)"/>
-<defs>
-<linearGradient id="paint0_linear_481_4810" x1="207.413" y1="61.882" x2="148.999" y2="163.067" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint1_linear_481_4810" x1="188.235" y1="204.189" x2="264.21" y2="152.592" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint2_linear_481_4810" x1="207.413" y1="61.882" x2="148.999" y2="163.067" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint3_linear_481_4810" x1="188.235" y1="204.189" x2="264.21" y2="152.592" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint4_linear_481_4810" x1="93.1761" y1="128.826" x2="66.2399" y2="104.746" gradientUnits="userSpaceOnUse">
-<stop offset="0.25" stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#2C08AC"/>
-</linearGradient>
-<linearGradient id="paint5_linear_481_4810" x1="50.9004" y1="195.826" x2="109.315" y2="94.6412" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint6_linear_481_4810" x1="70.0787" y1="53.5188" x2="-5.89657" y2="105.116" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint7_linear_481_4810" x1="50.9004" y1="195.826" x2="109.315" y2="94.6412" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint8_linear_481_4810" x1="70.0787" y1="53.5188" x2="-5.89657" y2="105.116" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint9_linear_481_4810" x1="165.135" y1="128.882" x2="192.072" y2="152.962" gradientUnits="userSpaceOnUse">
-<stop offset="0.25" stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#2C08AC"/>
-</linearGradient>
-</defs>
-</svg>
@@ -1,5 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M167.489 89.8618C167.489 87.9224 165.441 86.667 163.713 87.5473L154.788 92.0971C141.739 98.7493 133.523 112.159 133.523 126.806V194.718C133.533 199.053 128.837 201.777 125.08 199.647L84.2227 176.06C83.2036 175.472 82.5762 174.384 82.5762 173.207V106.445C82.5759 104.992 80.9999 104.087 79.7451 104.813L61.3467 115.428C53.4685 119.976 48.6096 128.382 48.6094 137.487V179.978C48.6094 189.074 53.4588 197.481 61.3467 202.039L67.3301 205.494C67.6627 205.707 68.0004 205.916 68.3447 206.115L95.3066 221.682C103.184 226.23 112.889 226.232 120.779 221.679L154.312 202.32C154.271 202.342 154.23 202.362 154.189 202.384C154.283 202.333 154.375 202.281 154.468 202.229L154.312 202.32C154.463 202.237 154.615 202.154 154.765 202.068L154.762 202.065C162.646 197.511 167.487 189.102 167.488 180.009L167.489 89.8618Z" fill="black"/>
-<path d="M163.007 36.0259C155.13 31.4781 145.424 31.4763 137.533 36.0288L104.002 55.3882C104.029 55.3732 104.057 55.359 104.084 55.3442C104.02 55.3794 103.956 55.4159 103.893 55.4516L104.002 55.3882C103.851 55.4714 103.699 55.5536 103.549 55.6401L103.552 55.6411C95.6664 60.1948 90.8241 68.6053 90.8232 77.6987L90.8223 167.846C90.8223 169.786 92.8707 171.04 94.5986 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9897C124.778 58.6479 129.49 55.9211 133.25 58.0698L174.091 81.6479C175.11 82.2363 175.737 83.3238 175.737 84.5005V151.263C175.738 152.716 177.314 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.73C209.704 68.6343 204.855 60.2267 196.967 55.6694L190.982 52.2143C190.65 52.0011 190.313 51.792 189.969 51.5932L163.007 36.0259Z" fill="black"/>
-</svg>
@@ -1,5 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="black"/>
-<path d="M167.489 89.8618C167.489 87.9224 165.441 86.667 163.713 87.5473L154.788 92.0971C141.739 98.7493 133.523 112.159 133.523 126.806V194.718C133.533 199.053 128.837 201.777 125.08 199.647L84.2227 176.06C83.2036 175.472 82.5762 174.384 82.5762 173.207V106.445C82.5759 104.992 80.9999 104.087 79.7451 104.813L61.3467 115.428C53.4685 119.976 48.6096 128.382 48.6094 137.487V179.978C48.6094 189.074 53.4588 197.481 61.3467 202.039L67.3301 205.494C67.6627 205.707 68.0004 205.916 68.3447 206.115L95.3066 221.682C103.184 226.23 112.889 226.232 120.779 221.679L154.312 202.32C154.271 202.342 154.23 202.362 154.189 202.384C154.283 202.333 154.375 202.281 154.468 202.229L154.312 202.32C154.463 202.237 154.615 202.154 154.765 202.068L154.762 202.065C162.646 197.511 167.487 189.102 167.488 180.009L167.489 89.8618Z" fill="white"/>
-<path d="M163.007 36.0259C155.13 31.4781 145.424 31.4763 137.533 36.0288L104.002 55.3882C104.029 55.3732 104.057 55.359 104.084 55.3442C104.02 55.3794 103.956 55.4159 103.893 55.4516L104.002 55.3882C103.851 55.4714 103.699 55.5536 103.549 55.6401L103.552 55.6411C95.6664 60.1948 90.8241 68.6053 90.8232 77.6987L90.8223 167.846C90.8223 169.786 92.8707 171.04 94.5986 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9897C124.778 58.6479 129.49 55.9211 133.25 58.0698L174.091 81.6479C175.11 82.2363 175.737 83.3238 175.737 84.5005V151.263C175.738 152.716 177.314 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.73C209.704 68.6343 204.855 60.2267 196.967 55.6694L190.982 52.2143C190.65 52.0011 190.313 51.792 189.969 51.5932L163.007 36.0259Z" fill="white"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M48.6094 179.978V137.487C48.6096 128.382 53.4685 119.976 61.3467 115.428L79.7451 104.813C80.9999 104.087 82.5759 104.992 82.5762 106.445V173.207C82.5762 174.384 83.2036 175.472 84.2227 176.06L125.08 199.647C128.837 201.777 133.533 199.053 133.523 194.718V126.806C133.523 112.388 141.484 99.1684 154.18 92.4135L154.788 92.0971L163.713 87.5473C165.441 86.667 167.489 87.9224 167.489 89.8618L167.488 180.009L167.474 180.86C167.181 189.624 162.399 197.653 154.762 202.065L154.765 202.068C154.615 202.154 154.463 202.237 154.312 202.32L154.468 202.229C154.375 202.281 154.283 202.333 154.189 202.384C154.23 202.362 154.271 202.342 154.312 202.32L120.779 221.679L120.034 222.092C112.534 226.093 103.539 226.092 96.0508 222.095L95.3066 221.682L68.3447 206.115C68.0004 205.916 67.6627 205.707 67.3301 205.494L61.3467 202.039C53.7053 197.624 48.9149 189.595 48.623 180.829L48.6094 179.978ZM175.737 84.5005C175.737 83.3974 175.186 82.3728 174.277 81.7641L174.091 81.6479L133.25 58.0698C129.49 55.9211 124.778 58.6479 124.788 62.9897V130.902L124.782 131.587C124.53 145.966 116.369 159.063 103.523 165.611L94.5986 170.16L94.4355 170.236C92.799 170.938 90.9459 169.803 90.8281 168.026L90.8223 167.846L90.8232 77.6987C90.8241 68.6053 95.6664 60.1948 103.552 55.6411L103.549 55.6401C103.699 55.5536 103.851 55.4714 104.002 55.3882L103.893 55.4516C103.956 55.4159 104.02 55.3794 104.084 55.3442C104.057 55.359 104.029 55.3732 104.002 55.3882L137.533 36.0288C145.424 31.4763 155.13 31.4781 163.007 36.0259L189.969 51.5932C190.313 51.792 190.65 52.0011 190.982 52.2143L196.967 55.6694C204.855 60.2267 209.704 68.6343 209.704 77.73V120.221L209.689 121.073C209.397 129.848 204.599 137.874 196.967 142.28L178.568 152.895C177.314 153.621 175.738 152.716 175.737 151.263V84.5005ZM176.814 149.866L176.819 149.864L176.832 149.856C176.826 149.859 176.82 149.862 176.814 149.866ZM137.023 194.71L137.019 195.038C136.802 201.878 129.341 206.087 123.354 202.692L123.33 202.678L82.4727 179.091C80.3698 177.877 79.0762 175.634 79.0762 173.207V109.239L63.0957 118.458C56.5124 122.259 52.3745 129.183 52.1221 136.752L52.1094 137.487V179.978C52.1094 187.823 56.2909 195.075 63.0957 199.007H63.0967L69.0801 202.462L69.1504 202.503L69.2188 202.547C69.5212 202.741 69.8111 202.92 70.0947 203.083L97.0566 218.651L97.6982 219.007C104.372 222.569 112.434 222.453 119.029 218.648L152.514 199.316L152.512 199.312C152.581 199.274 152.65 199.236 152.752 199.178L152.753 199.181C152.775 199.169 152.796 199.158 152.815 199.147L153.011 199.035C159.81 195.107 163.987 187.854 163.988 180.009V91.3344L156.378 95.2153C144.501 101.27 137.023 113.475 137.023 126.806V194.71ZM94.3223 166.372L101.934 162.493C113.811 156.438 121.288 144.233 121.288 130.902V62.9897C121.278 55.9521 128.901 51.5532 134.986 55.0307L135 55.0385L175.841 78.6167L176.036 78.7339C178.023 79.9714 179.237 82.15 179.237 84.5005V148.468L195.217 139.249C202.013 135.326 206.204 128.075 206.204 120.221V77.73C206.204 69.8848 202.022 62.6318 195.217 58.6997L189.232 55.2456L189.162 55.2046L189.094 55.1606C188.788 54.9649 188.5 54.787 188.219 54.6245L161.257 39.0571C154.463 35.135 146.091 35.1311 139.282 39.0591L139.283 39.06L105.765 58.4106L105.767 58.4135C105.713 58.443 105.723 58.4383 105.602 58.5063L105.6 58.5034C105.535 58.5391 105.481 58.5691 105.433 58.5962L105.302 58.6723C98.5016 62.5995 94.324 69.8532 94.3232 77.6987L94.3223 166.372Z" fill="black"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="black"/>
-<path d="M48.6094 179.978V137.487C48.6096 128.382 53.4685 119.976 61.3467 115.428L79.7451 104.813C80.9999 104.087 82.5759 104.992 82.5762 106.445V173.207C82.5762 174.384 83.2036 175.472 84.2227 176.06L125.08 199.647C128.837 201.777 133.533 199.053 133.523 194.718V126.806C133.523 112.388 141.484 99.1684 154.18 92.4135L154.788 92.0971L163.713 87.5473C165.441 86.667 167.489 87.9224 167.489 89.8618L167.488 180.009L167.474 180.86C167.181 189.624 162.399 197.653 154.762 202.065L154.765 202.068C154.615 202.154 154.463 202.237 154.312 202.32L154.468 202.229C154.375 202.281 154.283 202.333 154.189 202.384C154.23 202.362 154.271 202.342 154.312 202.32L120.779 221.679L120.034 222.092C112.534 226.093 103.539 226.092 96.0508 222.095L95.3066 221.682L68.3447 206.115C68.0004 205.916 67.6627 205.707 67.3301 205.494L61.3467 202.039C53.7053 197.624 48.9149 189.595 48.623 180.829L48.6094 179.978ZM175.737 84.5005C175.737 83.3974 175.186 82.3728 174.277 81.7641L174.091 81.6479L133.25 58.0698C129.49 55.9211 124.778 58.6479 124.788 62.9897V130.902L124.782 131.587C124.53 145.966 116.369 159.063 103.523 165.611L94.5986 170.16L94.4355 170.236C92.799 170.938 90.9459 169.803 90.8281 168.026L90.8223 167.846L90.8232 77.6987C90.8241 68.6053 95.6664 60.1948 103.552 55.6411L103.549 55.6401C103.699 55.5536 103.851 55.4714 104.002 55.3882L103.893 55.4516C103.956 55.4159 104.02 55.3794 104.084 55.3442C104.057 55.359 104.029 55.3732 104.002 55.3882L137.533 36.0288C145.424 31.4763 155.13 31.4781 163.007 36.0259L189.969 51.5932C190.313 51.792 190.65 52.0011 190.982 52.2143L196.967 55.6694C204.855 60.2267 209.704 68.6343 209.704 77.73V120.221L209.689 121.073C209.397 129.848 204.599 137.874 196.967 142.28L178.568 152.895C177.314 153.621 175.738 152.716 175.737 151.263V84.5005ZM176.814 149.866L176.819 149.864L176.832 149.856C176.826 149.859 176.82 149.862 176.814 149.866ZM137.023 194.71L137.019 195.038C136.802 201.878 129.341 206.087 123.354 202.692L123.33 202.678L82.4727 179.091C80.3698 177.877 79.0762 175.634 79.0762 173.207V109.239L63.0957 118.458C56.5124 122.259 52.3745 129.183 52.1221 136.752L52.1094 137.487V179.978C52.1094 187.823 56.2909 195.075 63.0957 199.007H63.0967L69.0801 202.462L69.1504 202.503L69.2188 202.547C69.5212 202.741 69.8111 202.92 70.0947 203.083L97.0566 218.651L97.6982 219.007C104.372 222.569 112.434 222.453 119.029 218.648L152.514 199.316L152.512 199.312C152.581 199.274 152.65 199.236 152.752 199.178L152.753 199.181C152.775 199.169 152.796 199.158 152.815 199.147L153.011 199.035C159.81 195.107 163.987 187.854 163.988 180.009V91.3344L156.378 95.2153C144.501 101.27 137.023 113.475 137.023 126.806V194.71ZM94.3223 166.372L101.934 162.493C113.811 156.438 121.288 144.233 121.288 130.902V62.9897C121.278 55.9521 128.901 51.5532 134.986 55.0307L135 55.0385L175.841 78.6167L176.036 78.7339C178.023 79.9714 179.237 82.15 179.237 84.5005V148.468L195.217 139.249C202.013 135.326 206.204 128.075 206.204 120.221V77.73C206.204 69.8848 202.022 62.6318 195.217 58.6997L189.232 55.2456L189.162 55.2046L189.094 55.1606C188.788 54.9649 188.5 54.787 188.219 54.6245L161.257 39.0571C154.463 35.135 146.091 35.1311 139.282 39.0591L139.283 39.06L105.765 58.4106L105.767 58.4135C105.713 58.443 105.723 58.4383 105.602 58.5063L105.6 58.5034C105.535 58.5391 105.481 58.5691 105.433 58.5962L105.302 58.6723C98.5016 62.5995 94.324 69.8532 94.3232 77.6987L94.3223 166.372Z" fill="white"/>
-</svg>
@@ -173,11 +173,11 @@ new SampleDefinition
 ```csharp
 new SampleDefinition
 {
-    Name = "Workflow_Visualization",
-    ProjectPath = "samples/03-workflows/Visualization",
+    Name = "Workflow_Declarative_GenerateCode",
+    ProjectPath = "samples/03-workflows/Declarative/GenerateCode",
    IsDeterministic = true,
-    MustContain = ["Generating workflow visualization...", "Mermaid string:", "DiGraph string:"],
-    ExpectedOutputDescription = ["The output should show workflow visualization in Mermaid and DiGraph formats."],
+    MustContain = ["WORKFLOW: Parsing", "WORKFLOW: Defined"],
+    ExpectedOutputDescription = ["The output should show a YAML workflow being parsed and C# code being generated from it."],
 },
 ```

@@ -22,14 +22,14 @@
    <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
    <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
    <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.AgentServer.Core" Version="1.0.0-beta.25" />
-    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.4" />
-    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.5" />
+    <PackageVersion Include="Azure.AI.AgentServer.Core" Version="1.0.0-beta.23" />
+    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.3" />
+    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.4" />
    <PackageVersion Include="Azure.Search.Documents" Version="12.0.0" />
    <PackageVersion Include="Azure.AI.Projects" Version="2.1.0-beta.2" />
    <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.10" />
    <PackageVersion Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
-    <PackageVersion Include="Azure.Core" Version="1.56.0" />
+    <PackageVersion Include="Azure.Core" Version="1.55.0" />
    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
    <PackageVersion Include="DotNetEnv" Version="3.1.1" />
    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
@@ -44,7 +44,7 @@
    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
    <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.5" />
-    <PackageVersion Include="System.ClientModel" Version="1.12.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.11.0" />
    <PackageVersion Include="System.CodeDom" Version="10.0.0" />
    <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
@@ -99,7 +99,7 @@
    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.67.0-preview" />
    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.0-preview" />
    <!-- Agent SDKs -->
-    <PackageVersion Include="GitHub.Copilot.SDK" Version="1.0.0" />
+    <PackageVersion Include="GitHub.Copilot.SDK" Version="1.0.0-beta.2" />
    <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
    <!-- M365 Agents SDK -->
    <PackageVersion Include="AdaptiveCards" Version="3.1.0" />
@@ -109,7 +109,7 @@
    <PackageVersion Include="A2A" Version="1.0.0-preview2" />
    <PackageVersion Include="A2A.AspNetCore" Version="1.0.0-preview2" />
    <!-- MCP -->
-    <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
+    <PackageVersion Include="ModelContextProtocol" Version="1.1.0" />
    <!-- Hyperlight -->
    <PackageVersion Include="Hyperlight.HyperlightSandbox.Api" Version="0.4.0" />
    <PackageVersion Include="Hyperlight.HyperlightSandbox.Guest.Python" Version="0.4.0" />
@@ -117,18 +117,17 @@
    <Project Path="samples/02-agents/AgentSkills/Agent_Step03_ClassBasedSkills/Agent_Step03_ClassBasedSkills.csproj" />
    <Project Path="samples/02-agents/AgentSkills/Agent_Step04_MixedSkills/Agent_Step04_MixedSkills.csproj" />
    <Project Path="samples/02-agents/AgentSkills/Agent_Step05_SkillsWithDI/Agent_Step05_SkillsWithDI.csproj" />
-    <Project Path="samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills/Agent_Step06_McpBasedSkills.csproj" />
  </Folder>
  <Folder Name="/Samples/02-agents/Harness/">
    <File Path="samples/02-agents/Harness/README.md" />
-    <Project Path="samples/02-agents/Harness/ConsoleReactiveComponents/ConsoleReactiveComponents.csproj" />
-    <Project Path="samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveFramework.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Shared_Console/Harness_Shared_Console.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Shared_Console_OpenAI/Harness_Shared_Console_OpenAI.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Step01_Research/Harness_Step01_Research.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Step02_Research_WithBackgroundAgents/Harness_Step02_Research_WithBackgroundAgents.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Step03_DataProcessing/Harness_Step03_DataProcessing.csproj" />
    <Project Path="samples/02-agents/Harness/Harness_Step04_CodeExecution/Harness_Step04_CodeExecution.csproj" />
+    <Project Path="samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveFramework.csproj" />
+    <Project Path="samples/02-agents/Harness/ConsoleReactiveComponents/ConsoleReactiveComponents.csproj" />
  </Folder>
  <Folder Name="/Samples/02-agents/AGUI/Step05_StateManagement/">
    <Project Path="samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj" />
@@ -174,7 +173,6 @@
    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step23_LocalMCP/Agent_Step23_LocalMCP.csproj" />
    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step24_CodeInterpreterFileDownload/Agent_Step24_CodeInterpreterFileDownload.csproj" />
    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/Agent_Step25_FoundryToolboxMcp.csproj" />
-    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step26_FoundryToolboxMcpSkills/Agent_Step26_FoundryToolboxMcpSkills.csproj" />
  </Folder>
  <Folder Name="/Samples/02-agents/Evaluation/">
    <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
@@ -243,10 +241,11 @@
    <Project Path="samples/03-workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
    <Project Path="samples/03-workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
    <Project Path="samples/03-workflows/Declarative/FunctionTools/FunctionTools.csproj" />
+    <Project Path="samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj" />
    <Project Path="samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj" />
    <Project Path="samples/03-workflows/Declarative/InputArguments/InputArguments.csproj" />
-    <Project Path="samples/03-workflows/Declarative/InvokeFoundryToolboxMcp/InvokeFoundryToolboxMcp.csproj" />
    <Project Path="samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj" />
+    <Project Path="samples/03-workflows/Declarative/InvokeFoundryToolboxMcp/InvokeFoundryToolboxMcp.csproj" />
    <Project Path="samples/03-workflows/Declarative/InvokeHttpRequest/InvokeHttpRequest.csproj" />
    <Project Path="samples/03-workflows/Declarative/InvokeMcpTool/InvokeMcpTool.csproj" />
    <Project Path="samples/03-workflows/Declarative/Marketing/Marketing.csproj" />
@@ -344,9 +343,6 @@
  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox/">
    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox/HostedToolbox.csproj" />
  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-ToolboxMcpSkills/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-ToolboxMcpSkills/HostedToolboxMcpSkills.csproj" />
-  </Folder>
  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-AzureSearchRag/">
    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-AzureSearchRag/HostedAzureSearchRag.csproj" />
  </Folder>
@@ -363,9 +359,6 @@
  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/">
    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/HostedWorkflowHandoff.csproj" />
  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-AgentSkills/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-AgentSkills/HostedAgentSkills.csproj" />
-  </Folder>
  <Folder Name="/Samples/04-hosting/DurableAgents/" />
  <Folder Name="/Samples/04-hosting/DurableAgents/AzureFunctions/">
    <File Path="samples/04-hosting/DurableAgents/AzureFunctions/.editorconfig" />
@@ -601,14 +594,13 @@
    <Project Path="src/Microsoft.Agents.AI.DurableTask/Microsoft.Agents.AI.DurableTask.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Foundry.Hosting/Microsoft.Agents.AI.Foundry.Hosting.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Foundry/Microsoft.Agents.AI.Foundry.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.GitHub.Copilot/Microsoft.Agents.AI.GitHub.Copilot.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Harness/Microsoft.Agents.AI.Harness.csproj" />
+    <Project Path="src/Microsoft.Agents.AI.GitHub.Copilot/Microsoft.Agents.AI.GitHub.Copilot.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.AzureFunctions/Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting.OpenAI/Microsoft.Agents.AI.Hosting.OpenAI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Hosting.AspNetCore/Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Hyperlight/Microsoft.Agents.AI.Hyperlight.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj" />
@@ -629,8 +621,8 @@
    <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
    <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
    <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Foundry.Hosting.IntegrationTests.TestContainer/Foundry.Hosting.IntegrationTests.TestContainer.csproj" />
    <Project Path="tests/Foundry.Hosting.IntegrationTests/Foundry.Hosting.IntegrationTests.csproj" />
+    <Project Path="tests/Foundry.Hosting.IntegrationTests.TestContainer/Foundry.Hosting.IntegrationTests.TestContainer.csproj" />
    <Project Path="tests/Foundry.IntegrationTests/Foundry.IntegrationTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/Microsoft.Agents.AI.DurableTask.IntegrationTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.GitHub.Copilot.IntegrationTests/Microsoft.Agents.AI.GitHub.Copilot.IntegrationTests.csproj" />
@@ -655,8 +647,8 @@
    <Project Path="tests/Microsoft.Agents.AI.Declarative.UnitTests/Microsoft.Agents.AI.Declarative.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.DevUI.UnitTests/Microsoft.Agents.AI.DevUI.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.DurableTask.UnitTests/Microsoft.Agents.AI.DurableTask.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Foundry.UnitTests/Microsoft.Agents.AI.Foundry.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Harness.UnitTests/Microsoft.Agents.AI.Harness.UnitTests.csproj" />
    <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.UnitTests/Microsoft.Agents.AI.Hosting.A2A.UnitTests.csproj" />
@@ -20,17 +20,13 @@
      "src\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj",
      "src\\Microsoft.Agents.AI.Hosting.A2A\\Microsoft.Agents.AI.Hosting.A2A.csproj",
      "src\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AspNetCore\\Microsoft.Agents.AI.Hosting.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",      
+      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",
      "src\\Microsoft.Agents.AI.Hosting.OpenAI\\Microsoft.Agents.AI.Hosting.OpenAI.csproj",
      "src\\Microsoft.Agents.AI.Hosting\\Microsoft.Agents.AI.Hosting.csproj",
-      "src\\Microsoft.Agents.AI.Mcp\\Microsoft.Agents.AI.Mcp.csproj",
      "src\\Microsoft.Agents.AI.Mem0\\Microsoft.Agents.AI.Mem0.csproj",
      "src\\Microsoft.Agents.AI.OpenAI\\Microsoft.Agents.AI.OpenAI.csproj",
      "src\\Microsoft.Agents.AI.Purview\\Microsoft.Agents.AI.Purview.csproj",
-      "src\\Microsoft.Agents.AI.Tools.Shell\\Microsoft.Agents.AI.Tools.Shell.csproj",
      "src\\Microsoft.Agents.AI.Workflows.Declarative.Foundry\\Microsoft.Agents.AI.Workflows.Declarative.Foundry.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative.Mcp\\Microsoft.Agents.AI.Workflows.Declarative.Mcp.csproj",
      "src\\Microsoft.Agents.AI.Workflows.Declarative\\Microsoft.Agents.AI.Workflows.Declarative.csproj",
      "src\\Microsoft.Agents.AI.Workflows.Generators\\Microsoft.Agents.AI.Workflows.Generators.csproj",
      "src\\Microsoft.Agents.AI.Workflows\\Microsoft.Agents.AI.Workflows.csproj",
@@ -11,6 +11,9 @@
  <ItemGroup Condition="'$(InjectSharedIntegrationTestAzureCredentialsCode)' == 'true'">
    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\IntegrationTestsAzureCredentials\*.cs" LinkBase="Shared\IntegrationTestsAzureCredentials" />
  </ItemGroup>
+  <ItemGroup Condition="'$(InjectSharedBuildTestCode)' == 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\CodeTests\*.cs" LinkBase="Shared\CodeTests" />
+  </ItemGroup>
  <ItemGroup Condition="'$(InjectSharedWorkflowsExecution)' == 'true'">
    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Execution\*.cs" LinkBase="Shared\Workflows" />
  </ItemGroup>
@@ -363,25 +363,6 @@ internal static class AgentsSamples
            ],
        },

-        new SampleDefinition
-        {
-            Name = "Agent_Step06_McpBasedSkills",
-            ProjectPath = "samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills",
-            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
-            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
-            MustContain =
-            [
-                "Discovering MCP-based skills",
-                "Agent:",
-            ],
-            ExpectedOutputDescription =
-            [
-                "The output should show the agent converting 26.2 miles to kilometers and 75 kilograms to pounds.",
-                "The response should contain approximate numeric values for both conversions.",
-                "The output should not contain error messages or stack traces.",
-            ],
-        },
-
        // ── AgentWithMemory ─────────────────────────────────────────────────

        new SampleDefinition
@@ -439,6 +439,15 @@ internal static class WorkflowSamples
            ExpectedOutputDescription = ["The output should show a workflow calling function tools (e.g. a menu plugin) to answer a question about restaurant specials."],
        },

+        new SampleDefinition
+        {
+            Name = "Workflow_Declarative_GenerateCode",
+            ProjectPath = "samples/03-workflows/Declarative/GenerateCode",
+            IsDeterministic = true,
+            MustContain = ["WORKFLOW: Parsing", "WORKFLOW: Defined"],
+            ExpectedOutputDescription = ["The output should show a YAML workflow being parsed and C# code being generated from it."],
+        },
+
        new SampleDefinition
        {
            Name = "Workflow_Declarative_HostedWorkflow",
@@ -1,14 +1,14 @@
 <Project>
  <PropertyGroup>
    <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.9.0</VersionPrefix>
+    <VersionPrefix>1.6.2</VersionPrefix>
    <RCNumber>1</RCNumber>
-    <DateSuffix>260603</DateSuffix>
+    <DateSuffix>260521</DateSuffix>
    <PackageVersion Condition="'$(IsReleaseCandidate)' == 'true'">$(VersionPrefix)-rc$(RCNumber)</PackageVersion>
    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).$(DateSuffix).1</PackageVersion>
    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.$(DateSuffix).1</PackageVersion>
    <PackageVersion Condition="'$(IsReleased)' == 'true'">$(VersionPrefix)</PackageVersion>
-    <GitTag>1.9.0</GitTag>
+    <GitTag>1.6.2</GitTag>

    <Configurations>Debug;Release;Publish</Configurations>
    <IsPackable>true</IsPackable>
@@ -10,11 +10,6 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 builder.Services.AddHttpClient().AddLogging();
 builder.Services.AddAGUI();

-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 WebApplication app = builder.Build();

 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"]
@@ -14,7 +14,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
  </ItemGroup>

@@ -16,11 +16,6 @@ builder.Services.ConfigureHttpJsonOptions(options =>
    options.SerializerOptions.TypeInfoResolverChain.Add(SampleJsonSerializerContext.Default));
 builder.Services.AddAGUI();

-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 WebApplication app = builder.Build();

 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"]
@@ -14,7 +14,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
  </ItemGroup>

@@ -10,11 +10,6 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 builder.Services.AddHttpClient().AddLogging();
 builder.Services.AddAGUI();

-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 WebApplication app = builder.Build();

 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"]
@@ -14,7 +14,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
  </ItemGroup>

@@ -27,11 +27,6 @@ builder.Services.ConfigureHttpJsonOptions(options =>
    options.SerializerOptions.TypeInfoResolverChain.Add(ApprovalJsonContext.Default));
 builder.Services.AddAGUI();

-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 WebApplication app = builder.Build();

 app.UseHttpLogging();
@@ -14,7 +14,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
  </ItemGroup>

@@ -17,11 +17,6 @@ builder.Services.AddAGUI();
 // Configure to listen on port 8888
 builder.WebHost.UseUrls("http://localhost:8888");

-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 WebApplication app = builder.Build();

 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"]
@@ -14,7 +14,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
  </ItemGroup>

@@ -6,7 +6,6 @@

    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);GHCP001</NoWarn>
  </PropertyGroup>

  <ItemGroup>
@@ -2,22 +2,21 @@

 // This sample shows how to create a GitHub Copilot agent with shell command permissions.

-using GitHub.Copilot;
-using GitHub.Copilot.Rpc;
+using GitHub.Copilot.SDK;
 using Microsoft.Agents.AI;

 // Permission handler that prompts the user for approval
-static Task<PermissionDecision> PromptPermission(PermissionRequest request, PermissionInvocation invocation)
+static Task<PermissionRequestResult> PromptPermission(PermissionRequest request, PermissionInvocation invocation)
 {
    Console.WriteLine($"\n[Permission Request: {request.Kind}]");
    Console.Write("Approve? (y/n): ");

    string? input = Console.ReadLine()?.Trim().ToUpperInvariant();
-    PermissionDecision decision = input is "Y" or "YES"
-                                     ? PermissionDecision.ApproveOnce()
-                                     : PermissionDecision.Reject();
+    PermissionRequestResultKind kind = input is "Y" or "YES"
+                                     ? PermissionRequestResultKind.Approved
+                                     : PermissionRequestResultKind.Rejected;

-    return Task.FromResult(decision);
+    return Task.FromResult(new PermissionRequestResult { Kind = kind });
 }

 // Create and start a Copilot client
@@ -36,7 +36,7 @@ dotnet run
 You can customize the agent by providing additional configuration:

 ```csharp
-using GitHub.Copilot;
+using GitHub.Copilot.SDK;
 using Microsoft.Agents.AI;

 // Create and start a Copilot client
@@ -24,7 +24,6 @@ string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYM
 var skillsProvider = new AgentSkillsProvider(
    Path.Combine(AppContext.BaseDirectory, "skills"),
    SubprocessScriptRunner.RunAsync);
-
 // --- Agent Setup ---
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
@@ -51,7 +51,7 @@ Console.WriteLine($"Agent: {response.Text}");
 /// Properties annotated with <see cref="AgentSkillResourceAttribute"/> are automatically
 /// discovered as skill resources, and methods annotated with <see cref="AgentSkillScriptAttribute"/>
 /// are automatically discovered as skill scripts. Alternatively,
-/// <see cref="AgentClassSkill{TSelf}.Resources"/> and <see cref="AgentClassSkill{TSelf}.Scripts"/> can be overridden.
+/// <see cref="AgentSkill.Resources"/> and <see cref="AgentSkill.Scripts"/> can be overridden.
 /// </remarks>
 internal sealed class UnitConverterSkill : AgentClassSkill<UnitConverterSkill>
 {
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);MAAI001;MCPEXP001</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Mcp\Microsoft.Agents.AI.Mcp.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to discover Agent Skills served over MCP.
-//
-// When launched with "--server", this executable runs a small MCP stdio server
-// that exposes a unit-converter skill via the SEP-2640 convention:
-//   - skill://index.json      — discovery document listing all skills
-//   - skill://unit-converter/SKILL.md — the skill instructions
-//
-// In default (client) mode the sample launches itself as a child process,
-// connects via StdioClientTransport, and uses AgentSkillsProviderBuilder
-// to discover and inject the skill into a ChatClientAgent.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Server;
-using OpenAI.Responses;
-
-if (args.Length > 0 && args[0] == "--server")
-{
-    await RunMcpServerAsync();
-    return;
-}
-
-// --- Configuration ---
-string openAiEndpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")
-    ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-
-// --- MCP client + skill discovery ---
-// Launch this same assembly as a stdio MCP server in a child process.
-var thisAssemblyPath = typeof(Program).Assembly.Location;
-Console.WriteLine("Discovering MCP-based skills");
-
-await using McpClient client = await McpClient.CreateAsync(
-    new StdioClientTransport(new()
-    {
-        Name = "skills-server",
-        Command = "dotnet",
-        Arguments = [thisAssemblyPath, "--server"],
-    }));
-
-var skillsProvider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(client)
-    .Build();
-
-// --- Agent ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
-AIAgent agent = new AzureOpenAIClient(new Uri(openAiEndpoint), new DefaultAzureCredential())
-    .GetResponsesClient()
-    .AsAIAgent(new ChatClientAgentOptions
-    {
-        Name = "SkillsAgent",
-        ChatOptions = new()
-        {
-            Instructions = "You are a helpful assistant. Use available skills to answer the user.",
-        },
-        AIContextProviders = [skillsProvider],
-    },
-    model: deploymentName);
-
-// --- Run ---
-Console.WriteLine(new string('-', 60));
-
-AgentResponse response = await agent.RunAsync(
-    "How many kilometers is a marathon (26.2 miles)? And how many pounds is 75 kilograms?");
-
-Console.WriteLine($"Agent: {response.Text}");
-
-// --- Server mode (launched as a child process via --server) ---------------------------------
-static async Task RunMcpServerAsync()
-{
-    var builder = Host.CreateApplicationBuilder();
-
-    // Critical for stdio transport: any provider that writes to stdout will corrupt the
-    // JSON-RPC channel. Clear all providers; the MCP SDK routes its own diagnostics
-    // appropriately.
-    builder.Logging.ClearProviders();
-    builder.Logging.AddConsole(o => o.LogToStandardErrorThreshold = LogLevel.Trace);
-
-    builder.Services.AddMcpServer(o => o.ServerInfo = new() { Name = "SkillsServer", Version = "1.0.0" })
-    .WithStdioServerTransport()
-    .WithResources<SkillResources>();
-
-    await builder.Build().RunAsync();
-}
-
-#pragma warning disable CA1812 // Discovered by MCP SDK via [McpServerResourceType] attribute
-[McpServerResourceType]
-internal sealed class SkillResources
-#pragma warning restore CA1812
-{
-    private const string IndexJson = """
-        {
-            "$schema": "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
-            "skills": [
-                {
-                    "name": "unit-converter",
-                    "type": "skill-md",
-                    "description": "Convert between common units using a multiplication factor. Use when asked to convert miles, kilometers, pounds, or kilograms.",
-                    "url": "skill://unit-converter/SKILL.md"
-                }
-            ]
-        }
-        """;
-
-    private const string SkillMd = """
-        ---
-        name: unit-converter
-        description: Convert between common units using a multiplication factor. Use when asked to convert miles, kilometers, pounds, or kilograms.
-        ---
-
-        ## Usage
-
-        When the user requests a unit conversion, use these factors:
-
-        | From        | To          | Factor   |
-        |-------------|-------------|----------|
-        | miles       | kilometers  | 1.60934  |
-        | kilometers  | miles       | 0.621371 |
-        | pounds      | kilograms   | 0.453592 |
-        | kilograms   | pounds      | 2.20462  |
-
-        Formula: result = value × factor
-        """;
-
-    [McpServerResource(UriTemplate = "skill://index.json", Name = "Skill Index", MimeType = "application/json")]
-    [Description("SEP-2640 skill discovery index")]
-    public static string GetIndex() => IndexJson;
-
-    [McpServerResource(UriTemplate = "skill://unit-converter/SKILL.md", Name = "Unit Converter Skill", MimeType = "text/markdown")]
-    [Description("Unit converter skill instructions")]
-    public static string GetSkillMd() => SkillMd;
-}
@@ -1,34 +0,0 @@
-# MCP-Based Agent Skills Sample
-
-This sample demonstrates how to discover **Agent Skills served over MCP** with a `ChatClientAgent`.
-
-## What it demonstrates
-
- Hosting a small MCP server (in this same executable, launched with `--server`) that
-  exposes skill resources following the SEP-2640 convention.
- Connecting an `McpClient` to the embedded server via stdio transport.
- Building an `AgentSkillsProvider` via `UseMcpSkills(client)`, which reads
-  `skill://index.json` (SEP-2640 canonical discovery) and constructs skills from the
-  index entries.
- The progressive disclosure pattern across MCP: advertise → load → read resources, exactly
-  as for filesystem-backed skills.
-
-## Running the Sample
-
-### Prerequisites
-
- .NET 10.0 SDK
- Azure OpenAI endpoint with a deployed model
-
-### Setup
-
-```powershell
-$env:AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
-```
-
-### Run
-
-```powershell
-dotnet run
-```
@@ -9,7 +9,6 @@ Samples demonstrating Agent Skills capabilities. Each sample shows a different w
 | [Agent_Step03_ClassBasedSkills](Agent_Step03_ClassBasedSkills/) | Define skills as C# classes using `AgentClassSkill`. |
 | [Agent_Step04_MixedSkills](Agent_Step04_MixedSkills/) | **(Advanced)** Combine file-based, code-defined, and class-based skills using `AgentSkillsProviderBuilder`. |
 | [Agent_Step05_SkillsWithDI](Agent_Step05_SkillsWithDI/) | Use Dependency Injection with both code-defined (`AgentInlineSkill`) and class-based (`AgentClassSkill`) skills. |
-| [Agent_Step06_McpBasedSkills](Agent_Step06_McpBasedSkills/) | Discover skills served over the [Model Context Protocol (MCP)](https://modelcontextprotocol.io) via `AgentMcpSkillsSource`. Spins up an in-process MCP server that exposes skills as resources (`skill://...`) and connects an `McpClient` to it. |

 ## Key Concepts

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.Projects" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Mcp\Microsoft.Agents.AI.Mcp.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,93 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// Foundry Toolbox MCP Skills.
-//
-// Uses AgentSkillsProviderBuilder to discover MCP-based skills from a Foundry
-// Toolbox endpoint and inject them as AIContextProviders so the agent can
-// discover and use them at runtime.
-
-using System.Net.Http.Headers;
-using Azure.AI.Projects;
-using Azure.Core;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using ModelContextProtocol.Client;
-
-// --- Configuration ---
-string endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT")
-    ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-string toolboxMcpServerUrl = Environment.GetEnvironmentVariable("FOUNDRY_TOOLBOX_MCP_SERVER_URL")
-    ?? throw new InvalidOperationException("FOUNDRY_TOOLBOX_MCP_SERVER_URL is not set.");
-
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
-TokenCredential credential = new DefaultAzureCredential();
-
-using var httpClient = new HttpClient(new BearerTokenHandler(credential, "https://ai.azure.com/.default")
-{
-    InnerHandler = new HttpClientHandler(),
-});
-
-// --- Connect to the Foundry Toolbox MCP endpoint ---
-await using McpClient mcpClient = await McpClient.CreateAsync(
-    new HttpClientTransport(
-        new HttpClientTransportOptions
-        {
-            Endpoint = new Uri(toolboxMcpServerUrl),
-            Name = "foundry_toolbox",
-            TransportMode = HttpTransportMode.StreamableHttp,
-            AdditionalHeaders = new Dictionary<string, string>
-            {
-                ["Foundry-Features"] = "Toolboxes=V1Preview",
-            },
-        },
-        httpClient));
-
-// --- Discover MCP-based skills ---
-var skillsProvider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(mcpClient)
-    .Build();
-
-// --- Create the agent ---
-AIProjectClient aiProjectClient = new(new Uri(endpoint), credential);
-
-AIAgent agent = aiProjectClient.AsAIAgent(
-    options: new ChatClientAgentOptions
-    {
-        Name = "ToolboxMcpSkillsAgent",
-        ChatOptions = new()
-        {
-            ModelId = deploymentName,
-            Instructions = "You are a helpful assistant. Use available skills to answer the user.",
-        },
-        AIContextProviders = [skillsProvider],
-    });
-
-// --- Interactive prompt ---
-Console.Write("User: ");
-string? query = Console.ReadLine();
-
-if (string.IsNullOrWhiteSpace(query))
-{
-    Console.WriteLine("No input provided.");
-    return;
-}
-
-Console.WriteLine($"Assistant: {await agent.RunAsync(query)}");
-
-// ---------------------------------------------------------------------------
-// DelegatingHandler: attaches a fresh Foundry bearer token to every request
-// ---------------------------------------------------------------------------
-internal sealed class BearerTokenHandler(TokenCredential credential, string scope) : DelegatingHandler
-{
-    private readonly TokenRequestContext _tokenContext = new([scope]);
-
-    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-    {
-        AccessToken token = await credential.GetTokenAsync(this._tokenContext, cancellationToken).ConfigureAwait(false);
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token.Token);
-        return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
-    }
-}
@@ -1,32 +0,0 @@
-# Foundry Toolbox MCP Skills
-
-This sample uses
-`AgentSkillsProviderBuilder` to discover MCP-based skills from a Foundry Toolbox endpoint
-and inject them as `AIContextProviders` so the agent can discover and use them at runtime.
-
-## What this sample demonstrates
-
- Connecting to a Foundry toolbox's MCP endpoint via Streamable HTTP transport
- Injecting a fresh Azure AI bearer token (`https://ai.azure.com/.default`) on every MCP request
- Using `AgentSkillsProviderBuilder.UseMcpSkills(client)` to discover skills from the toolbox
- Injecting the discovered skills into `AIProjectClient.AsAIAgent(...)` via `AIContextProviders`
-
-## Prerequisites
-
- A Microsoft Foundry project with a toolbox already configured
- The toolbox MCP endpoint must expose `skill://index.json` with `skill-md` entries (SEP-2640). If the resource is absent, the sample runs but the skills provider will be empty.
- Azure CLI installed and authenticated (`az login`)
-
-Set the following environment variables:
-
-```powershell
-$env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project"
-$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"
-$env:FOUNDRY_TOOLBOX_MCP_SERVER_URL="https://your-foundry-service.services.ai.azure.com/api/projects/your-project/toolboxes/your-toolbox/mcp?api-version=v1"
-```
-
-## Run the sample
-
-```powershell
-dotnet run
-```
@@ -74,7 +74,6 @@ Some samples require extra tool-specific environment variables. See each sample
 | [Local MCP](./Agent_Step23_LocalMCP/) | Local MCP client with HTTP transport |
 | [Code interpreter file download](./Agent_Step24_CodeInterpreterFileDownload/) | Download container files generated by code interpreter |
 | [Foundry toolbox via MCP](./Agent_Step25_FoundryToolboxMcp/) | Use a Foundry Toolbox from a non-hosted agent via its MCP endpoint |
-| [Foundry toolbox MCP skills](./Agent_Step26_FoundryToolboxMcpSkills/) | Use a Foundry Toolbox with MCP-based skills discovery (SEP-2640) via AIContextProviders |

 ## Running the samples

@@ -72,95 +72,6 @@ public static class AnsiEscapes
    /// </summary>
    public static string ResetAttributes => "\x1b[0m";

-    /// <summary>
-    /// Returns the visible (printed) length of a string after stripping ANSI escape sequences.
-    /// Escape sequences are zero-width on screen but occupy characters in the raw string.
-    /// </summary>
-    /// <remarks>
-    /// This counts UTF-16 code units (chars) rather than terminal display cells. Emoji,
-    /// combining characters, variation selectors, and East Asian wide characters may be
-    /// measured incorrectly. For the console harness this is acceptable since content is
-    /// predominantly ASCII, and emoji are padded with surrounding spaces.
-    /// </remarks>
-    public static int VisibleLength(string text)
-    {
-        if (string.IsNullOrEmpty(text))
-        {
-            return 0;
-        }
-
-        int length = 0;
-        for (int i = 0; i < text.Length; i++)
-        {
-            if (text[i] == '\x1b' && i + 1 < text.Length && text[i + 1] == '[')
-            {
-                // Skip the ESC[ and all characters up to and including the final byte (0x40–0x7E).
-                i += 2;
-                while (i < text.Length && text[i] < 0x40)
-                {
-                    i++;
-                }
-
-                // i now points to the final byte of the escape sequence; the for-loop will advance past it.
-            }
-            else if (text[i] != '\n' && text[i] != '\r')
-            {
-                length++;
-            }
-        }
-
-        return length;
-    }
-
-    /// <summary>
-    /// Counts the number of physical terminal rows a text item will occupy,
-    /// accounting for both explicit newlines and terminal line wrapping.
-    /// </summary>
-    /// <param name="text">The text to measure.</param>
-    /// <param name="terminalWidth">The terminal width in columns. If &lt;= 0, wrapping is ignored (1 row per logical line).</param>
-    /// <returns>The number of physical rows the text occupies.</returns>
-    public static int CountPhysicalLines(string text, int terminalWidth)
-    {
-        if (string.IsNullOrEmpty(text))
-        {
-            return 0;
-        }
-
-        int physicalLines = 0;
-        int lineStart = 0;
-
-        for (int i = 0; i <= text.Length; i++)
-        {
-            if (i == text.Length || text[i] == '\n')
-            {
-                if (terminalWidth <= 0)
-                {
-                    // No wrapping — each logical line is one physical row
-                    physicalLines += 1;
-                }
-                else
-                {
-                    string logicalLine = text[lineStart..i];
-                    int visibleWidth = VisibleLength(logicalLine);
-
-                    physicalLines += visibleWidth == 0
-                        ? 1
-                        : (visibleWidth - 1) / terminalWidth + 1;
-                }
-
-                lineStart = i + 1;
-            }
-        }
-
-        // If text ends with a newline, don't count the trailing empty line
-        if (text[text.Length - 1] == '\n')
-        {
-            physicalLines--;
-        }
-
-        return physicalLines;
-    }
-
    private static int ConsoleColorToAnsi(ConsoleColor color) => color switch
    {
        ConsoleColor.Black => 30,
@@ -40,8 +40,8 @@ public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, Consol
            foreach (string line in props.Title.Split('\n'))
            {
                Console.Write(AnsiEscapes.MoveCursor(props.Y + row, props.X));
+                Console.Write(AnsiEscapes.EraseEntireLine);
                Console.Write(line);
-                Console.Write(AnsiEscapes.EraseToEndOfLine);
                row++;
            }
        }
@@ -52,6 +52,7 @@ public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, Consol
        for (int i = 0; i < totalItems; i++)
        {
            Console.Write(AnsiEscapes.MoveCursor(props.Y + row, props.X));
+            Console.Write(AnsiEscapes.EraseEntireLine);

            bool isSelected = i == props.SelectedIndex;
            bool isCustomTextOption = props.CustomTextPlaceholder != null && i == props.Items.Count;
@@ -71,7 +72,6 @@ public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, Consol
                }

                Console.Write(props.Items[i]);
-                Console.Write(AnsiEscapes.EraseToEndOfLine);

                if (isSelected)
                {
@@ -101,7 +101,6 @@ public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, Consol
            }

            Console.Write(props.CustomText);
-            Console.Write(AnsiEscapes.EraseToEndOfLine);

            if (isSelected)
            {
@@ -122,7 +121,6 @@ public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, Consol

            Console.Write(" ");
            Console.Write(props.CustomTextPlaceholder);
-            Console.Write(AnsiEscapes.EraseToEndOfLine);
            Console.Write(AnsiEscapes.ResetAttributes);
        }
    }
@@ -23,18 +23,16 @@ public record TextPanelProps : ConsoleReactiveProps
 public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiveState>
 {
    /// <summary>
-    /// Calculates the height (in lines) needed to render all items,
-    /// accounting for terminal line wrapping at the specified width.
+    /// Calculates the height (in lines) needed to render all items.
    /// </summary>
    /// <param name="items">The items to measure.</param>
-    /// <param name="terminalWidth">The terminal width in columns. When 0 or negative, wrapping is ignored.</param>
-    /// <returns>The total number of physical lines all items will occupy.</returns>
-    public static int CalculateHeight(IReadOnlyList<string> items, int terminalWidth = 0)
+    /// <returns>The total number of lines all items will occupy.</returns>
+    public static int CalculateHeight(IReadOnlyList<string> items)
    {
        int total = 0;
        for (int i = 0; i < items.Count; i++)
        {
-            total += AnsiEscapes.CountPhysicalLines(items[i], terminalWidth);
+            total += CountLines(items[i]);
        }

        return total;
@@ -49,20 +47,13 @@ public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiv
        {
            string text = props.Items[i];
            string[] lines = text.Split('\n');
-            int itemLineCount = AnsiEscapes.CountPhysicalLines(text, props.Width);
-            int itemRow = 0;
+            int lineCount = CountLines(text);

-            for (int j = 0; j < lines.Length && itemRow < itemLineCount; j++)
+            for (int j = 0; j < lineCount; j++)
            {
-                int linePhysicalRows = props.Width > 0
-                    ? Math.Max(1, (AnsiEscapes.VisibleLength(lines[j]) - 1) / props.Width + 1)
-                    : 1;
-
                Console.Write(AnsiEscapes.MoveAndEraseLine(props.Y + currentRow));
                Console.Write(lines[j]);
-
-                currentRow += linePhysicalRows;
-                itemRow += linePhysicalRows;
+                currentRow++;
            }
        }

@@ -75,4 +66,29 @@ public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiv
            }
        }
    }
+
+    private static int CountLines(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        int count = 1;
+        for (int i = 0; i < text.Length; i++)
+        {
+            if (text[i] == '\n')
+            {
+                count++;
+            }
+        }
+
+        // If text ends with a newline, don't count the trailing empty line
+        if (text[text.Length - 1] == '\n')
+        {
+            count--;
+        }
+
+        return count;
+    }
 }
@@ -17,19 +17,16 @@ public record TextScrollPanelProps : ConsoleReactiveProps
 /// <summary>
 /// State for <see cref="TextScrollPanel"/>.
 /// </summary>
-public record TextScrollPanelState : ConsoleReactiveState;
+/// <param name="RenderedCount">The number of items already rendered.</param>
+public record TextScrollPanelState(int RenderedCount = 0) : ConsoleReactiveState;

 /// <summary>
 /// A component that renders pre-rendered string items within a scroll area.
-/// The last rendered item is considered dynamic and will be re-rendered on each call.
-/// All prior items are considered finalized and are not re-rendered.
-/// Use <see cref="Invalidate"/> to force a full re-render.
+/// All items are considered finalized — only new items since the last render are output.
+/// Use <see cref="Reset"/> to force a full re-render.
 /// </summary>
 public class TextScrollPanel : ConsoleReactiveComponent<TextScrollPanelProps, TextScrollPanelState>
 {
-    private int _renderedCount;
-    private int _lastItemOffsetFromBottom;
-
    /// <summary>
    /// Initializes a new instance of the <see cref="TextScrollPanel"/> class.
    /// </summary>
@@ -38,12 +35,12 @@ public class TextScrollPanel : ConsoleReactiveComponent<TextScrollPanelProps, Te
        this.State = new TextScrollPanelState();
    }

-    /// <inheritdoc />
-    public override void Invalidate()
+    /// <summary>
+    /// Resets the panel so all items will be re-rendered on the next Render call.
+    /// </summary>
+    public void Reset()
    {
-        this._renderedCount = 0;
-        this._lastItemOffsetFromBottom = 0;
-        base.Invalidate();
+        this.State = new TextScrollPanelState();
    }

    /// <inheritdoc />
@@ -54,35 +51,16 @@ public class TextScrollPanel : ConsoleReactiveComponent<TextScrollPanelProps, Te
            return;
        }

-        int bottomRow = props.Y + props.Height - 1;
+        // Move cursor to the bottom of the scroll area
+        Console.Write(AnsiEscapes.MoveCursor(props.Y + props.Height - 1, props.X));

-        // Determine the first item to render. If we previously rendered items,
-        // re-render the last one (it may have changed/grown) from its stored position.
-        int startIndex = this._renderedCount > 0 ? this._renderedCount - 1 : 0;
-
-        if (this._renderedCount > 0 && this._lastItemOffsetFromBottom > 0)
-        {
-            // Reposition cursor to where the last rendered item began
-            Console.Write(AnsiEscapes.MoveCursor(bottomRow - this._lastItemOffsetFromBottom, props.X));
-        }
-        else
-        {
-            // First render — position at the bottom of the scroll area
-            Console.Write(AnsiEscapes.MoveCursor(bottomRow, props.X));
-        }
-
-        // Render from startIndex onwards
-        for (int i = startIndex; i < props.Items.Count; i++)
+        // Output only new items since last rendered
+        for (int i = state.RenderedCount; i < props.Items.Count; i++)
        {
            Console.Write(props.Items[i]);
        }

-        // Calculate the offset from bottom for the start of the new last item,
-        // accounting for terminal line wrapping at the available width.
-        int lastItemLines = AnsiEscapes.CountPhysicalLines(props.Items[^1], props.Width);
-        this._lastItemOffsetFromBottom = lastItemLines > 0 ? lastItemLines - 1 : 0;
-
-        // Update rendered count
-        this._renderedCount = props.Items.Count;
+        // Update state to track what we've rendered
+        this.State = new TextScrollPanelState(props.Items.Count);
    }
 }
@@ -13,11 +13,6 @@ public abstract class ConsoleReactiveComponent
    {
    }

-    /// <summary>
-    /// Gets the shared render lock across all component types to prevent ANSI escape sequence interleaving.
-    /// </summary>
-    protected static object RenderLock { get; } = new();
-
    /// <summary>
    /// Gets or sets the component's props as the base <see cref="ConsoleReactiveProps"/> type.
    /// Used by parent components to set layout (X, Y, Width, Height) on children without
@@ -45,6 +40,7 @@ public abstract class ConsoleReactiveComponent<TProps, TState> : ConsoleReactive
    where TProps : ConsoleReactiveProps
    where TState : ConsoleReactiveState
 {
+    private readonly object _renderLock = new();
    private TProps? _lastRenderedProps;
    private TState? _lastRenderedState;

@@ -78,7 +74,7 @@ public abstract class ConsoleReactiveComponent<TProps, TState> : ConsoleReactive
    /// </summary>
    public override void Render()
    {
-        lock (RenderLock)
+        lock (this._renderLock)
        {
            if (this.Props is null)
            {
@@ -101,7 +97,7 @@ public abstract class ConsoleReactiveComponent<TProps, TState> : ConsoleReactive
    /// <inheritdoc/>
    public override void Invalidate()
    {
-        lock (RenderLock)
+        lock (this._renderLock)
        {
            this._lastRenderedProps = default;
            this._lastRenderedState = default;
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveFramework;
-
-/// <summary>
-/// Caches the result of a mapping function and only recomputes when the input changes.
-/// </summary>
-/// <typeparam name="TInput">The type of the input value.</typeparam>
-/// <typeparam name="TOutput">The type of the mapped output value.</typeparam>
-public class ConsoleReactiveMemo<TInput, TOutput>
-{
-    private TInput? _previousInput;
-    private TOutput? _cachedOutput;
-    private bool _hasValue;
-
-    /// <summary>
-    /// Returns the cached output if <paramref name="input"/> equals the previously stored input;
-    /// otherwise invokes <paramref name="mapper"/> to compute and cache a new output.
-    /// </summary>
-    /// <param name="input">The current input value.</param>
-    /// <param name="mapper">A function that maps the input to an output value.</param>
-    /// <returns>The cached or newly computed output.</returns>
-    public TOutput Map(TInput input, Func<TInput, TOutput> mapper)
-    {
-        ArgumentNullException.ThrowIfNull(mapper);
-
-        if (!this._hasValue || !EqualityComparer<TInput>.Default.Equals(input, this._previousInput))
-        {
-            this._previousInput = input;
-            this._cachedOutput = mapper(input);
-            this._hasValue = true;
-        }
-
-        return this._cachedOutput!;
-    }
-}
@@ -19,6 +19,7 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
    private readonly ListSelection _listSelection = new();
    private readonly TextInput _textInput = new();
    private readonly TextScrollPanel _textScrollPanel = new();
+    private readonly TextPanel _textPanel = new();
    private readonly TextPanel _queuedPanel = new();
    private readonly AgentStatus _agentStatus = new();
    private readonly AgentModeAndHelp _modeAndHelp = new();
@@ -28,7 +29,6 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
    private int _scrollRegionBottom;
    private bool _resizedSinceLastRender = true;
    private bool _deactivated;
-    private BottomPanelMode _lastRenderedBottomPanelMode;

    /// <summary>
    /// Initializes a new instance of the <see cref="HarnessAppComponent"/> class.
@@ -341,8 +341,18 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
            return;
        }

+        // Determine the text panel height for the last scroll item
+        IReadOnlyList<string> lastItems = state.ScrollAreaContentItems.Count > 0
+            ? [state.ScrollAreaContentItems[^1]]
+            : [];
+        int textPanelHeight = TextPanel.CalculateHeight(lastItems);
+        if (textPanelHeight > 0)
+        {
+            textPanelHeight++; // Extra line for spacing between text panel and rule
+        }
+
        // Calculate queued items panel height
-        int queuedPanelHeight = TextPanel.CalculateHeight(state.QueuedItems, state.ConsoleWidth);
+        int queuedPanelHeight = TextPanel.CalculateHeight(state.QueuedItems);

        // Build the bottom panel child based on mode
        ConsoleReactiveComponent bottomChild;
@@ -407,14 +417,6 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
            bottomChild = this._textInput;
        }

-        // When the bottom panel mode changes, the new child must repaint even if its
-        // props haven't changed — the screen area was overwritten by the previous child.
-        if (state.Mode != this._lastRenderedBottomPanelMode)
-        {
-            bottomChild.Invalidate();
-            this._lastRenderedBottomPanelMode = state.Mode;
-        }
-
        var ruleProps = new TopBottomRuleProps
        {
            Width = state.ConsoleWidth,
@@ -442,7 +444,7 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
        int modeAndHelpHeight = showStatusAndHelp ? AgentModeAndHelp.CalculateHeight(modeAndHelpProps) : 0;

        int ruleHeight = TopBottomRule.CalculateHeight(ruleProps);
-        int nonScrollHeight = ruleHeight + agentStatusHeight + queuedPanelHeight + modeAndHelpHeight + 1; // +1 for bottom padding
+        int nonScrollHeight = ruleHeight + textPanelHeight + agentStatusHeight + queuedPanelHeight + modeAndHelpHeight + 1; // +1 for bottom padding
        int scrollBottom = Math.Max(1, state.ConsoleHeight - nonScrollHeight);

        // If scroll region changed or a clear is needed, reset everything
@@ -453,36 +455,52 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
            System.Console.Write(AnsiEscapes.ResetScrollRegion);
            System.Console.Write(AnsiEscapes.EraseEntireScreen);
            System.Console.Write(AnsiEscapes.EraseScrollbackBuffer);
+            this._textScrollPanel.Reset();
+            this._resizedSinceLastRender = false;

            // Invalidate all children so they re-render even if props haven't changed
            this._rule.Invalidate();
            this._textScrollPanel.Invalidate();
+            this._textPanel.Invalidate();
            this._queuedPanel.Invalidate();
            this._agentStatus.Invalidate();
            this._modeAndHelp.Invalidate();
            this._textInput.Invalidate();
            this._listSelection.Invalidate();
-
-            this._resizedSinceLastRender = false;
        }

        this._scrollRegionBottom = scrollBottom;

        System.Console.Write(AnsiEscapes.SetScrollRegion(scrollBottom));

-        // Render text scroll panel in the scroll area
+        // Render text scroll panel in the scroll area (all items except the last)
+        IReadOnlyList<string> scrollItems = state.ScrollAreaContentItems.Count > 1
+            ? state.ScrollAreaContentItems.Take(state.ScrollAreaContentItems.Count - 1).ToList()
+            : [];
+
        this._textScrollPanel.Props = new TextScrollPanelProps
        {
            X = 1,
            Y = 1,
            Width = state.ConsoleWidth,
            Height = scrollBottom,
-            Items = state.ScrollAreaContentItems,
+            Items = scrollItems,
        };
        this._textScrollPanel.Render();

-        // Render queued input items between scroll area and agent status
-        int queuedPanelY = scrollBottom + 1;
+        // Render the text panel for the last (dynamic) item just below the scroll region
+        this._textPanel.Props = new TextPanelProps
+        {
+            X = 1,
+            Y = scrollBottom + 1,
+            Width = state.ConsoleWidth,
+            Height = textPanelHeight,
+            Items = lastItems,
+        };
+        this._textPanel.Render();
+
+        // Render queued input items between text panel and agent status
+        int queuedPanelY = scrollBottom + textPanelHeight + 1;
        this._queuedPanel.Props = new TextPanelProps
        {
            X = 1,
@@ -88,17 +88,16 @@ public sealed class PlanningOutputObserver : ConsoleObserver
        {
            planningResponse = JsonSerializer.Deserialize<PlanningResponse>(collectedText);
        }
-        catch (JsonException)
+        catch (JsonException ex)
        {
-            // JSON parsing failed — fall back to rendering as regular text output.
-            await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+            await ux.WriteInfoLineAsync($"❌ Failed to parse planning response: {ex.Message}", ConsoleColor.Red);
+            await ux.WriteInfoLineAsync($"(raw response) {collectedText}", ConsoleColor.DarkYellow);
            return null;
        }

        if (planningResponse is null)
        {
-            // Null result — fall back to rendering as regular text output.
-            await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+            await ux.WriteInfoLineAsync("(no structured response from agent)", ConsoleColor.DarkYellow);
            return null;
        }

@@ -119,8 +118,7 @@ public sealed class PlanningOutputObserver : ConsoleObserver
            return new List<FollowUpAction> { this.BuildApprovalAction(question, session) };
        }

-        // Unexpected type — fall back to rendering as regular text output.
-        await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+        await ux.WriteInfoLineAsync($"(unexpected response type: {planningResponse.Type})", ConsoleColor.DarkYellow);
        return null;
    }

@@ -5,17 +5,17 @@ using Microsoft.Extensions.AI;
 namespace Harness.Shared.Console.ToolFormatters;

 /// <summary>
-/// Formats <c>mode_*</c> tool calls, showing the target mode for Set operations.
+/// Formats <c>AgentMode_*</c> tool calls, showing the target mode for Set operations.
 /// </summary>
 public sealed class ModeToolFormatter : ToolCallFormatter
 {
    /// <inheritdoc/>
-    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("mode_", StringComparison.Ordinal);
+    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("AgentMode_", StringComparison.Ordinal);

    /// <inheritdoc/>
    public override string? FormatDetail(FunctionCallContent call) => call.Name switch
    {
-        "mode_set" => FormatStringArg(call, "mode"),
+        "AgentMode_Set" => FormatStringArg(call, "mode"),
        _ => null,
    };

@@ -7,20 +7,20 @@ using Microsoft.Extensions.AI;
 namespace Harness.Shared.Console.ToolFormatters;

 /// <summary>
-/// Formats <c>todos_*</c> tool calls with tree-view output for added items
+/// Formats <c>TodoList_*</c> tool calls with tree-view output for added items
 /// and structured output for complete/remove operations.
 /// </summary>
 public sealed class TodoToolFormatter : ToolCallFormatter
 {
    /// <inheritdoc/>
-    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("todos_", StringComparison.Ordinal);
+    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("TodoList_", StringComparison.Ordinal);

    /// <inheritdoc/>
    public override string? FormatDetail(FunctionCallContent call) => call.Name switch
    {
-        "todos_add" => FormatAddTodos(call),
-        "todos_complete" => FormatCompleteTodos(call),
-        "todos_remove" => FormatIdList(call, "ids", "Remove"),
+        "TodoList_Add" => FormatAddTodos(call),
+        "TodoList_Complete" => FormatCompleteTodos(call),
+        "TodoList_Remove" => FormatIdList(call, "ids", "Remove"),
        _ => null,
    };

@@ -2,7 +2,6 @@

 #pragma warning disable OPENAI001 // Suppress experimental API warnings for Responses API usage.

-using System.Text.Json;
 using Harness.Shared.Console.Observers;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -54,94 +53,9 @@ public sealed class OpenAIResponsesErrorObserver : ConsoleObserver

            case StreamingResponseIncompleteUpdate incompleteUpdate:
                string? reason = incompleteUpdate.Response?.IncompleteStatusDetails?.Reason?.ToString();
-                if (string.Equals(reason, "content_filter", StringComparison.OrdinalIgnoreCase))
-                {
-                    string detail = GetContentFilterDetails(incompleteUpdate);
-                    const string Message = "🛡️  The service's built-in content filter guardrails were triggered and the response was cut short.";
-                    await ux.WriteInfoLineAsync(
-                        string.IsNullOrEmpty(detail) ? Message : $"{Message}\n{detail}",
-                        ConsoleColor.Yellow);
-                }
-                else
-                {
-                    string incompleteText = $"⚠️ Response incomplete: {reason ?? "unknown reason"}";
-                    await ux.WriteInfoLineAsync(incompleteText, ConsoleColor.Yellow);
-                }
-
+                string incompleteText = $"⚠️ Response incomplete: {reason ?? "unknown reason"}";
+                await ux.WriteInfoLineAsync(incompleteText, ConsoleColor.Yellow);
                break;
        }
    }
-
-    /// <summary>
-    /// Extracts content filter details from the serialized response JSON and returns
-    /// a formatted string showing which specific categories were triggered.
-    /// Returns <see cref="string.Empty"/> if details cannot be extracted.
-    /// </summary>
-    private static string GetContentFilterDetails(StreamingResponseIncompleteUpdate incompleteUpdate)
-    {
-        try
-        {
-            var data = System.ClientModel.Primitives.ModelReaderWriter.Write(incompleteUpdate);
-            using var doc = JsonDocument.Parse(data.ToString());
-            var root = doc.RootElement;
-
-            // Navigate into the nested response object if present.
-            JsonElement responseElement = root.TryGetProperty("response", out var resp) ? resp : root;
-
-            if (!responseElement.TryGetProperty("content_filters", out var filtersArray)
-                || filtersArray.ValueKind != JsonValueKind.Array)
-            {
-                return string.Empty;
-            }
-
-            foreach (var filter in filtersArray.EnumerateArray())
-            {
-                if (!filter.TryGetProperty("content_filter_results", out var results)
-                    || results.ValueKind != JsonValueKind.Object)
-                {
-                    continue;
-                }
-
-                // Collect category data for aligned output.
-                var categories = new List<(string Name, bool Filtered, string? Severity)>();
-                foreach (var category in results.EnumerateObject())
-                {
-                    if (category.Value.ValueKind != JsonValueKind.Object)
-                    {
-                        continue;
-                    }
-
-                    bool filtered = category.Value.TryGetProperty("filtered", out var f) && f.GetBoolean();
-                    string? severity = category.Value.TryGetProperty("severity", out var s) ? s.GetString() : null;
-                    categories.Add((category.Name, filtered, severity));
-                }
-
-                // Build all category lines into a single string.
-                int maxNameLen = categories.Count > 0 ? categories.Max(c => c.Name.Length) : 0;
-                var lines = new List<string>();
-
-                foreach (var (name, filtered, severity) in categories)
-                {
-                    string paddedName = name.PadRight(maxNameLen);
-                    string icon = filtered ? "❌" : "✅";
-                    string statusText = filtered ? "Filtered    " : "Not Filtered";
-                    string severityText = severity is not null ? $"   Severity: {severity}" : "";
-
-                    lines.Add($"    {icon} {paddedName}  {statusText}{severityText}");
-                }
-
-                if (lines.Count > 0)
-                {
-                    return string.Join("\n", lines);
-                }
-            }
-
-            return string.Empty;
-        }
-        catch
-        {
-            // Parsing not critical — skip silently if it fails.
-            return string.Empty;
-        }
-    }
 }
@@ -79,10 +79,8 @@ AIAgent agent =
    .GetProjectOpenAIClient()
    .GetResponsesClient()
    .AsIChatClient(deploymentName)
-    .AsHarnessAgent(new HarnessAgentOptions
+    .AsHarnessAgent(MaxContextWindowTokens, MaxOutputTokens, new HarnessAgentOptions
    {
-        MaxContextWindowTokens = MaxContextWindowTokens,
-        MaxOutputTokens = MaxOutputTokens,
        Name = "ResearchAgent",
        Description = "A research assistant that plans and executes research tasks.",
        DisableFileAccess = true,                           // If enabled, this would allow the agent to read/write files in a working directory
@@ -44,10 +44,8 @@ AIAgent webSearchAgent =
    .GetProjectOpenAIClient()
    .GetResponsesClient()
    .AsIChatClient(deploymentName)
-    .AsHarnessAgent(new HarnessAgentOptions
+    .AsHarnessAgent(MaxContextWindowTokens, MaxOutputTokens, new HarnessAgentOptions
    {
-        MaxContextWindowTokens = MaxContextWindowTokens,
-        MaxOutputTokens = MaxOutputTokens,
        Name = "WebSearchAgent",
        Description = "An agent that can search the web to find information.",
        OpenTelemetrySourceName = TracingSourceName,
@@ -94,10 +92,8 @@ AIAgent parentAgent =
    .GetProjectOpenAIClient()
    .GetResponsesClient()
    .AsIChatClient(deploymentName)
-    .AsHarnessAgent(new HarnessAgentOptions
+    .AsHarnessAgent(MaxContextWindowTokens, MaxOutputTokens, new HarnessAgentOptions
    {
-        MaxContextWindowTokens = MaxContextWindowTokens,
-        MaxOutputTokens = MaxOutputTokens,
        Name = "StockPriceResearcher",
        Description = "An agent that researches stock prices using background agents.",
        OpenTelemetrySourceName = TracingSourceName,
@@ -68,10 +68,8 @@ AIAgent agent =
    .GetProjectOpenAIClient()
    .GetResponsesClient()
    .AsIChatClient(deploymentName)
-    .AsHarnessAgent(new HarnessAgentOptions
+    .AsHarnessAgent(MaxContextWindowTokens, MaxOutputTokens, new HarnessAgentOptions
    {
-        MaxContextWindowTokens = MaxContextWindowTokens,
-        MaxOutputTokens = MaxOutputTokens,
        Name = "DataAnalyst",
        Description = "A data analyst assistant that reads, analyzes, and processes data files.",
        OpenTelemetrySourceName = TracingSourceName,
@@ -89,10 +89,8 @@ AIAgent agent =
    .GetProjectOpenAIClient()
    .GetResponsesClient()
    .AsIChatClient(deploymentName)
-    .AsHarnessAgent(new HarnessAgentOptions
+    .AsHarnessAgent(MaxContextWindowTokens, MaxOutputTokens, new HarnessAgentOptions
    {
-        MaxContextWindowTokens = MaxContextWindowTokens,
-        MaxOutputTokens = MaxOutputTokens,
        Name = "CodeExecutionAgent",
        Description = "A technical assistant with sandboxed code execution and skill-based workflows.",
        OpenTelemetrySourceName = TracingSourceName,
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
+    <NoWarn>$(NoWarn);CA1812</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <InjectSharedThrow>true</InjectSharedThrow>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System.Diagnostics;
+using Microsoft.Agents.AI.Workflows.Declarative;
+
+namespace Demo.DeclarativeEject;
+
+/// <summary>
+/// HOW TO: Convert a workflow from a declartive (yaml based) definition to code.
+/// </summary>
+/// <remarks>
+/// <b>Usage</b>
+/// Provide the path to the workflow definition file as the first argument.
+/// All other arguments are intepreted as a queue of inputs.
+/// When no input is queued, interactive input is requested from the console.
+/// </remarks>
+internal sealed class Program
+{
+    public static void Main(string[] args)
+    {
+        Program program = new(args);
+        program.Execute();
+    }
+
+    private void Execute()
+    {
+        // Read and parse the declarative workflow.
+        Notify($"WORKFLOW: Parsing {Path.GetFullPath(this.WorkflowFile)}");
+
+        Stopwatch timer = Stopwatch.StartNew();
+
+        // Use DeclarativeWorkflowBuilder to generate code based on a YAML file.
+        string code =
+            DeclarativeWorkflowBuilder.Eject(
+                this.WorkflowFile,
+                DeclarativeWorkflowLanguage.CSharp,
+                workflowNamespace: "Demo.DeclarativeCode",
+                workflowPrefix: "Sample");
+
+        Notify($"\nWORKFLOW: Defined {timer.Elapsed}\n");
+
+        Console.WriteLine(code);
+    }
+
+    private const string DefaultWorkflow = "Marketing.yaml";
+
+    private string WorkflowFile { get; }
+
+    private Program(string[] args)
+    {
+        this.WorkflowFile = ParseWorkflowFile(args);
+    }
+
+    private static string ParseWorkflowFile(string[] args)
+    {
+        string workflowFile = args.FirstOrDefault() ?? DefaultWorkflow;
+
+        if (!File.Exists(workflowFile) && !Path.IsPathFullyQualified(workflowFile))
+        {
+            string? repoFolder = GetRepoFolder();
+            if (repoFolder is not null)
+            {
+                workflowFile = Path.Combine(repoFolder, "declarative-agents", "workflow-samples", workflowFile);
+                workflowFile = Path.ChangeExtension(workflowFile, ".yaml");
+            }
+        }
+
+        if (!File.Exists(workflowFile))
+        {
+            throw new InvalidOperationException($"Unable to locate workflow: {Path.GetFullPath(workflowFile)}.");
+        }
+
+        return workflowFile;
+
+        static string? GetRepoFolder()
+        {
+            DirectoryInfo? current = new(Directory.GetCurrentDirectory());
+
+            while (current is not null)
+            {
+                if (Directory.Exists(Path.Combine(current.FullName, ".git")))
+                {
+                    return current.FullName;
+                }
+
+                current = current.Parent;
+            }
+
+            return null;
+        }
+    }
+
+    private static void Notify(string message)
+    {
+        Console.ForegroundColor = ConsoleColor.Cyan;
+        try
+        {
+            Console.WriteLine(message);
+        }
+        finally
+        {
+            Console.ResetColor();
+        }
+    }
+}
@@ -0,0 +1,28 @@
+{
+  "profiles": {
+    "Marketing": {
+      "commandName": "Project",
+      "commandLineArgs": "\"Marketing.yaml\""
+    },
+    "MathChat": {
+      "commandName": "Project",
+      "commandLineArgs": "\"MathChat.yaml\""
+    },
+    "Question": {
+      "commandName": "Project",
+      "commandLineArgs": "\"Question.yaml\""
+    },
+    "Research": {
+      "commandName": "Project",
+      "commandLineArgs": "\"DeepResearch.yaml\""
+    },
+    "ResponseObject": {
+      "commandName": "Project",
+      "commandLineArgs": "\"ResponseObject.yaml\""
+    },
+    "UserInput": {
+      "commandName": "Project",
+      "commandLineArgs": "\"UserInput.yaml\""
+    }
+  }
+}
@@ -50,16 +50,12 @@ internal static partial class WorkflowHelper
    /// <summary>
    /// Executor that starts the concurrent processing by sending messages to the agents.
    /// </summary>
-    [SendsMessage(typeof(List<ChatMessage>))]
-    [SendsMessage(typeof(TurnToken))]
-    private sealed partial class ConcurrentStartExecutor()
-        : Executor("ConcurrentStartExecutor", declareCrossRunShareable: true), IResettableExecutor
+    private sealed partial class ConcurrentStartExecutor() : Executor("ConcurrentStartExecutor")
    {
        [MessageHandler]
-        internal ValueTask RouteMessages(IEnumerable<ChatMessage> messages, IWorkflowContext context, CancellationToken cancellationToken)
+        internal ValueTask RouteMessages(List<ChatMessage> messages, IWorkflowContext context, CancellationToken cancellationToken)
        {
-            List<ChatMessage> payload = messages as List<ChatMessage> ?? messages.ToList();
-            return context.SendMessageAsync(payload, cancellationToken: cancellationToken);
+            return context.SendMessageAsync(messages, cancellationToken: cancellationToken);
        }

        [MessageHandler]
@@ -67,16 +63,13 @@ internal static partial class WorkflowHelper
        {
            return context.SendMessageAsync(token, cancellationToken: cancellationToken);
        }
-
-        public ValueTask ResetAsync() => default;
    }

    /// <summary>
    /// Executor that aggregates the results from the concurrent agents.
    /// </summary>
-    [YieldsOutput(typeof(string))]
-    private sealed partial class ConcurrentAggregationExecutor() :
-        Executor<List<ChatMessage>>("ConcurrentAggregationExecutor"), IResettableExecutor
+    [YieldsOutput(typeof(List<ChatMessage>))]
+    private sealed partial class ConcurrentAggregationExecutor() : Executor<List<ChatMessage>>("ConcurrentAggregationExecutor")
    {
        private readonly List<ChatMessage> _messages = [];

@@ -97,11 +90,5 @@ internal static partial class WorkflowHelper
                await context.YieldOutputAsync(formattedMessages, cancellationToken);
            }
        }
-
-        public ValueTask ResetAsync()
-        {
-            this._messages.Clear();
-            return default;
-        }
    }
 }
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>",
+    "REDIS_CONNECTION_STRING": "localhost:6379",
+    "REDIS_STREAM_TTL_MINUTES": "10"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None"
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;TaskHub=default;Authentication=None",
+    "AZURE_OPENAI_ENDPOINT": "<AZURE_OPENAI_ENDPOINT>",
+    "AZURE_OPENAI_DEPLOYMENT_NAME": "<AZURE_OPENAI_DEPLOYMENT_NAME>"
+  }
+}
@@ -1,14 +0,0 @@
-AZURE_AI_PROJECT_ENDPOINT=<your-azure-ai-project-endpoint>
-ASPNETCORE_URLS=http://+:8088
-ASPNETCORE_ENVIRONMENT=Development
-AZURE_AI_MODEL_DEPLOYMENT_NAME=gpt-4o
-AGENT_NAME=hosted-agent-skills
-SKILL_NAMES=support-style,escalation-policy
-# Set to true to provision sample skills to Foundry on startup (first-run convenience).
-# In production, skills are provisioned externally — leave this unset or false.
-PROVISION_SAMPLE_SKILLS=true
-AZURE_BEARER_TOKEN=DefaultAzureCredential
-# When running outside the Foundry platform the platform-injected isolation keys are absent.
-# These two variables provide fallback values for local Docker debugging only.
-HOSTED_USER_ISOLATION_KEY=local-dev-user
-HOSTED_CHAT_ISOLATION_KEY=local-dev-chat
@@ -1,26 +0,0 @@
-# Dockerfile for end-users consuming the Agent Framework via NuGet packages.
-#
-# This Dockerfile performs a full `dotnet restore` and `dotnet publish` inside the container,
-# which only succeeds when the project references its dependencies via PackageReference (see the
-# commented-out section in HostedAgentSkills.csproj). Contributors building from the
-# agent-framework repository source must use Dockerfile.contributor instead because
-# ProjectReference dependencies live outside this folder and cannot be restored from inside
-# this build context.
-#
-# Use the official .NET 10.0 ASP.NET runtime as a parent image
-FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
-WORKDIR /app
-
-FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
-WORKDIR /src
-COPY . .
-RUN dotnet restore
-RUN dotnet publish -c Release -o /app/publish
-
-# Final stage
-FROM base AS final
-WORKDIR /app
-COPY --from=build /app/publish .
-EXPOSE 8088
-ENV ASPNETCORE_URLS=http://+:8088
-ENTRYPOINT ["dotnet", "HostedAgentSkills.dll"]
@@ -1,23 +0,0 @@
-# Dockerfile for contributors building from the agent-framework repository source.
-#
-# This project uses ProjectReference to the local Microsoft.Agents.AI source,
-# which means a standard multi-stage Docker build cannot resolve dependencies outside
-# this folder. Instead, pre-publish the app targeting the container runtime and copy
-# the output into the container:
-#
-#   dotnet publish -c Debug -f net10.0 -r linux-musl-x64 --self-contained false -o out
-#   docker build -f Dockerfile.contributor -t hosted-agent-skills .
-#   docker run --rm -p 8088:8088 \
-#     -e AGENT_NAME=hosted-agent-skills \
-#     -e HOSTED_USER_ISOLATION_KEY=alice \
-#     -e HOSTED_CHAT_ISOLATION_KEY=alice-chat-1 \
-#     --env-file .env hosted-agent-skills
-#
-# For end-users consuming the NuGet package (not ProjectReference), use the standard
-# Dockerfile which performs a full dotnet restore + publish inside the container.
-FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final
-WORKDIR /app
-COPY out/ .
-EXPOSE 8088
-ENV ASPNETCORE_URLS=http://+:8088
-ENTRYPOINT ["dotnet", "HostedAgentSkills.dll"]
@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <RootNamespace>HostedAgentSkills</RootNamespace>
-    <AssemblyName>HostedAgentSkills</AssemblyName>
-    <NoWarn>$(NoWarn);MEAI001;OPENAI001;AAIP001</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.Projects" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="DotNetEnv" />
-  </ItemGroup>
-
-  <!-- For contributors: uses ProjectReference to build against local source -->
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry.Hosting\Microsoft.Agents.AI.Foundry.Hosting.csproj" />
-    <ProjectReference Include="..\Hosted_Shared_Contributor_Setup\Hosted_Shared_Contributor_Setup.csproj" />
-  </ItemGroup>
-
-  <!-- For end-users: uncomment the PackageReference below and remove the ProjectReferences above
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Agents.AI" Version="1.6.1" />
-    <PackageReference Include="Microsoft.Agents.AI.Foundry" Version="1.6.1-preview.260514.1" />
-    <PackageReference Include="Microsoft.Agents.AI.Foundry.Hosting" Version="1.6.1-preview.260514.1" />
-  </ItemGroup>
-  -->
-
-  <!-- Include the skills/ directory in the publish output so the sample can provision them -->
-  <ItemGroup>
-    <None Include="skills\**\*" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-</Project>
@@ -1,215 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// Hosted-AgentSkills
-//
-// Demonstrates how to host an agent that loads its behavioral guidelines from Foundry Skills at
-// startup. Skills are authored as SKILL.md files, uploaded to Foundry via the Skills REST API,
-// and downloaded by the agent on boot so guideline updates ship without code changes.
-//
-// The agent uses AgentSkillsProvider from the Agent Framework which implements the progressive
-// disclosure pattern from the Agent Skills specification (https://agentskills.io/):
-//   1. Advertise — skill names and descriptions are injected into the system prompt.
-//   2. Load — the model calls load_skill to retrieve the full SKILL.md body on demand.
-//
-// IMPORTANT: In production, skill provisioning (uploading SKILL.md files to Foundry) is an
-// external concern — it is NOT the hosted agent's responsibility. The provisioning helper below
-// is included for sample convenience only, so the sample is self-contained and runnable without
-// a separate setup step. A real deployment pipeline would provision skills separately (e.g., via
-// a CI/CD step, a CLI script, or a management portal).
-
-#pragma warning disable AAIP001 // ProjectAgentSkills is experimental
-
-using System.ClientModel;
-using System.IO.Compression;
-using Azure.AI.Projects;
-using Azure.AI.Projects.Agents;
-using Azure.Core;
-using Azure.Identity;
-using DotNetEnv;
-using Hosted_Shared_Contributor_Setup;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Foundry.Hosting;
-using Microsoft.Extensions.AI;
-
-// Load .env file if present (for local development)
-Env.TraversePath().Load();
-
-string endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT")
-    ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o";
-string skillNames = Environment.GetEnvironmentVariable("SKILL_NAMES")
-    ?? throw new InvalidOperationException("SKILL_NAMES is not set. Provide a comma-separated list of skill names (e.g., support-style,escalation-policy).");
-
-string[] requestedSkills = skillNames.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-if (requestedSkills.Length == 0)
-{
-    throw new InvalidOperationException("SKILL_NAMES must list at least one skill name.");
-}
-
-// Validate skill names to prevent path traversal.
-foreach (string name in requestedSkills)
-{
-    if (name.Contains('.') || name.Contains('/') || name.Contains('\\') || Path.IsPathRooted(name))
-    {
-        throw new InvalidOperationException(
-            $"Invalid skill name '{name}': skill names must not contain path separators or dots.");
-    }
-}
-
-// Use a chained credential: try a temporary dev token first (for local Docker debugging),
-// then fall back to DefaultAzureCredential (for local dev via dotnet run / managed identity in production).
-TokenCredential credential = new ChainedTokenCredential(
-    new DevTemporaryTokenCredential(),
-    new DefaultAzureCredential());
-
-AIProjectClient projectClient = new(new Uri(endpoint), credential);
-ProjectAgentSkills skillsClient = projectClient.AgentAdministrationClient.GetAgentSkills();
-
-// ── Provision skills (sample convenience only — NOT a production pattern) ─────
-// In production, skills are provisioned externally (e.g., via CI/CD or a management script).
-// This helper ensures the sample's SKILL.md files exist in Foundry so the sample is runnable
-// out of the box without a separate setup step. Set PROVISION_SAMPLE_SKILLS=true to enable.
-string sourceSkillsDir = Path.Combine(AppContext.BaseDirectory, "skills");
-bool provisionEnabled = string.Equals(
-    Environment.GetEnvironmentVariable("PROVISION_SAMPLE_SKILLS"), "true", StringComparison.OrdinalIgnoreCase);
-if (provisionEnabled && Directory.Exists(sourceSkillsDir))
-{
-    await EnsureSkillsProvisionedAsync(skillsClient, sourceSkillsDir, requestedSkills);
-}
-
-// ── Download skills from Foundry ─────────────────────────────────────────────
-// Pull the latest copy of each skill from Foundry into a runtime-only folder.
-// This directory is recreated on every startup so the agent always picks up
-// the latest version of each skill.
-string downloadedSkillsDir = Path.Combine(AppContext.BaseDirectory, "downloaded_skills");
-await DownloadSkillsAsync(skillsClient, requestedSkills, downloadedSkillsDir);
-
-// ── Wire skills into the agent ───────────────────────────────────────────────
-// AgentSkillsProvider implements progressive disclosure: skill names and descriptions
-// are advertised in the system prompt (~100 tokens per skill), and the full SKILL.md
-// body is loaded on demand when the model calls the load_skill tool.
-AgentSkillsProvider skillsProvider = new(downloadedSkillsDir);
-
-ChatClientAgent agent = projectClient.AsAIAgent(new ChatClientAgentOptions
-{
-    Name = Environment.GetEnvironmentVariable("AGENT_NAME") ?? "hosted-agent-skills",
-    ChatOptions = new ChatOptions
-    {
-        ModelId = deploymentName,
-        Instructions = "You are a customer-support assistant for Contoso Outdoors.",
-    },
-    AIContextProviders = [skillsProvider]
-});
-
-// Host the agent as a Foundry Hosted Agent using the Responses API.
-var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddFoundryResponses(agent);
-builder.Services.AddDevTemporaryLocalContributorSetup(); // Local Docker debugging only - must not be used in production.
-
-var app = builder.Build();
-app.MapFoundryResponses();
-
-// Contributor-only: in Development, also map the per-agent OpenAI route shape that live Foundry uses
-// so a local REPL client can target this server via AIProjectClient.AsAIAgent(Uri agentEndpoint).
-// Do not use this in production. Hosted Foundry agents only support the agent-endpoint path.
-app.MapDevTemporaryLocalAgentEndpoint();
-
-app.Run();
-
-// ── Helpers ──────────────────────────────────────────────────────────────────
-
-// Downloads each named skill from Foundry and extracts the ZIP archive into a
-// separate subdirectory under the target directory.
-static async Task DownloadSkillsAsync(ProjectAgentSkills skillsClient, string[] skillNames, string targetDir)
-{
-    if (Directory.Exists(targetDir))
-    {
-        Directory.Delete(targetDir, recursive: true);
-    }
-
-    Directory.CreateDirectory(targetDir);
-
-    foreach (string name in skillNames)
-    {
-        Console.WriteLine($"Downloading skill '{name}' from Foundry...");
-        BinaryData zipData = await skillsClient.DownloadSkillAsync(name);
-
-        string skillDir = Path.Combine(targetDir, name);
-        Directory.CreateDirectory(skillDir);
-
-        using var zipStream = zipData.ToStream();
-        using var archive = new ZipArchive(zipStream, ZipArchiveMode.Read);
-        SafeExtractZip(archive, skillDir);
-
-        if (!File.Exists(Path.Combine(skillDir, "SKILL.md")))
-        {
-            throw new InvalidOperationException(
-                $"Downloaded archive for '{name}' did not contain a SKILL.md at the root.");
-        }
-    }
-}
-
-// Extracts a ZIP archive into a destination directory, rejecting entries that would
-// escape the target path (zip-slip guard).
-static void SafeExtractZip(ZipArchive archive, string destinationDir)
-{
-    string destRoot = Path.GetFullPath(destinationDir);
-    string destRootWithSep = Path.EndsInDirectorySeparator(destRoot)
-        ? destRoot
-        : destRoot + Path.DirectorySeparatorChar;
-
-    // Use ordinal comparison on Unix (case-sensitive FS) and ordinal-ignore-case on Windows.
-    var comparison = OperatingSystem.IsWindows()
-        ? StringComparison.OrdinalIgnoreCase
-        : StringComparison.Ordinal;
-
-    foreach (ZipArchiveEntry entry in archive.Entries)
-    {
-        string entryPath = Path.GetFullPath(Path.Combine(destRoot, entry.FullName));
-        if (!entryPath.StartsWith(destRootWithSep, comparison)
-            && !string.Equals(entryPath, destRoot, comparison))
-        {
-            throw new InvalidOperationException(
-                $"Refusing to extract unsafe path '{entry.FullName}' outside of '{destRoot}'.");
-        }
-
-        if (string.IsNullOrEmpty(entry.Name))
-        {
-            // Directory entry — ensure it exists.
-            Directory.CreateDirectory(entryPath);
-        }
-        else
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(entryPath)!);
-            entry.ExtractToFile(entryPath, overwrite: true);
-        }
-    }
-}
-
-// Ensures each requested skill is provisioned in Foundry. For each skill name, checks whether
-// the skill exists and uploads it from the local source directory if it does not.
-//
-// This is a sample convenience helper — in production, skill provisioning is an external concern.
-static async Task EnsureSkillsProvisionedAsync(ProjectAgentSkills skillsClient, string sourceDir, string[] skillNames)
-{
-    foreach (string name in skillNames)
-    {
-        string skillPath = Path.Combine(sourceDir, name);
-        if (!Directory.Exists(skillPath) || !File.Exists(Path.Combine(skillPath, "SKILL.md")))
-        {
-            continue; // No local source for this skill — skip provisioning.
-        }
-
-        try
-        {
-            await skillsClient.GetSkillAsync(name);
-            Console.WriteLine($"Skill '{name}' already exists in Foundry.");
-        }
-        catch (ClientResultException ex) when (ex.Status == 404)
-        {
-            Console.WriteLine($"Provisioning skill '{name}' from {skillPath}...");
-            AgentsSkill imported = await skillsClient.CreateSkillFromPackageAsync(skillPath);
-            Console.WriteLine($"  Imported skill '{imported.Name}' (id={imported.SkillId}, has_blob={imported.HasBlob}).");
-        }
-    }
-}
@@ -1,109 +0,0 @@
-# What this sample demonstrates
-
-An [Agent Framework](https://github.com/microsoft/agent-framework) agent that loads its behavioral guidelines from [**Foundry Skills**](https://learn.microsoft.com/en-us/azure/foundry/agents/how-to/tools/skills) at startup, hosted using the **Responses protocol**. Skills are authored once as `SKILL.md` files, uploaded to your Foundry project through the Skills REST API, and downloaded by the agent on boot so updates ship without code changes.
-
-## How It Works
-
-### Authoring skills
-
-Each skill is a Markdown file with a YAML front matter block. This sample ships two source skills under [`skills/`](skills/):
-
-| Skill | Purpose |
-|---|---|
-| [`support-style`](skills/support-style/SKILL.md) | Voice, formatting, and signature rules for Contoso Outdoors support replies. |
-| [`escalation-policy`](skills/escalation-policy/SKILL.md) | When and how to escalate a customer ticket. |
-
-Each `SKILL.md` includes a unique `*-CANARY-*` token that the model is asked to echo, so you can prove the skill was loaded from Foundry (not hallucinated) by checking the response.
-
-> The `name` and `description` values in the YAML front matter must be **unquoted** — quoting them causes the Skills REST API to return HTTP 500 on import.
-
-### Uploading skills
-
-The sample includes a convenience provisioning step that checks whether each skill exists in Foundry and uploads it if not, gated behind the `PROVISION_SAMPLE_SKILLS=true` env var. **In production, skill provisioning is an external concern** — it is NOT the hosted agent's responsibility. A real deployment pipeline would provision skills separately (e.g., via a CI/CD step, a CLI script, or a management portal).
-
-The provisioning uses `ProjectAgentSkills.CreateSkillFromPackageAsync(directoryPath)` from the `Azure.AI.Projects.Agents` SDK. The method packages the `SKILL.md` file as a ZIP and uploads it to Foundry.
-
-### Downloading skills at agent startup
-
-[`Program.cs`](Program.cs) reads the comma-separated `SKILL_NAMES` env var and for each skill name downloads the ZIP archive from Foundry via `ProjectAgentSkills.DownloadSkillAsync(name)`, then unpacks it into a **separate runtime directory** at `downloaded_skills/<name>/` (kept distinct from the static `skills/` source folder).
-
-An [`AgentSkillsProvider`](../../../../../src/Microsoft.Agents.AI/Skills/AgentSkillsProvider.cs) is then built over `downloaded_skills/` and attached to the agent as a context provider. The provider follows the [Agent Skills](https://agentskills.io/) progressive-disclosure pattern:
-
-1. **Advertise** — skill names and descriptions are injected into the system prompt at session start (~100 tokens per skill).
-2. **Load** — the model calls the `load_skill` tool when it decides a skill is relevant to the user's turn, and the full `SKILL.md` body is returned.
-
-This means the model only pays the token cost for a skill's full body when it actually needs it, and updating a skill in Foundry + restarting the agent is enough to pick up the change — no code redeploy required.
-
-> **Note:** This sample supports instruction-only and resource-based skills. If your downloaded skills contain scripts, add a script runner when constructing the `AgentSkillsProvider`.
-
-### Agent Hosting
-
-The agent is hosted using the [Agent Framework](https://github.com/microsoft/agent-framework) with the Responses API hosting layer (`AddFoundryResponses` / `MapFoundryResponses`).
-
-## Prerequisites
-
- An Azure AI Foundry project with a deployed model (e.g., `gpt-4o`)
- Azure CLI logged in (`az login`)
-
-### Required RBAC
-
-Your identity (or the Managed Identity running the container in production) needs **Azure AI User** on the Foundry project scope. This single role covers both authoring skills and downloading them.
-
-## Running the Agent Host
-
-Set the required environment variables and run the sample with `dotnet run`:
-
-```bash
-export AZURE_AI_PROJECT_ENDPOINT="https://<account>.services.ai.azure.com/api/projects/<project>"
-export AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-4o"
-export SKILL_NAMES="support-style,escalation-policy"
-export PROVISION_SAMPLE_SKILLS="true"   # First run only — provisions skills to Foundry
-```
-
-Or in PowerShell:
-
-```powershell
-$env:SKILL_NAMES="support-style,escalation-policy"
-$env:PROVISION_SAMPLE_SKILLS="true"     # First run only — provisions skills to Foundry
-```
-
-You can also place these in a `.env` file next to `Program.cs` — see [`.env.example`](.env.example).
-
-On startup you should see:
-
-```text
-Skill 'support-style' already exists in Foundry.
-Skill 'escalation-policy' already exists in Foundry.
-Downloading skill 'support-style' from Foundry...
-Downloading skill 'escalation-policy' from Foundry...
-```
-
-The downloaded `SKILL.md` files land under `downloaded_skills/<name>/SKILL.md` next to the published output. This directory is recreated from scratch on every run, so deleting it manually is never necessary.
-
-## Interacting with the agent
-
-> Send a POST request to the server with a JSON body containing an `"input"` field to interact with the agent. For example:
-
-```bash
-curl -X POST http://localhost:8088/responses -H "Content-Type: application/json" -d '{"input": "Hi, I am Alex. I just want to confirm I can return my tent within 30 days."}'
-curl -X POST http://localhost:8088/responses -H "Content-Type: application/json" -d '{"input": "I want a $750 refund on Order #A-1042 right now or I am calling my lawyer."}'
-```
-
-| Prompt mentions | Skill that should drive the response |
-|---|---|
-| Routine return / shipping / care question | Model loads `support-style` (canary `STYLE-CANARY-3318`) — no escalation. |
-| Injury, legal threat, press, or refund > $500 | Model loads `escalation-policy` (canary `ESC-CANARY-7742`) **and** `support-style`. |
-
-Because skills are loaded on demand, the canary token in a response also proves the model actually invoked `load_skill` for the matching skill (not just saw its name in the advertised list).
-
-## Deploying the Agent to Foundry
-
-When deploying to Foundry, make sure `SKILL_NAMES` is set in your `azd` environment so it gets injected into the hosted container per [`agent.manifest.yaml`](agent.manifest.yaml):
-
-```bash
-azd env set SKILL_NAMES "support-style,escalation-policy"
-```
-
-The deployed agent's Managed Identity needs **Azure AI User** on the Foundry project to download skills at startup.
-
-> The `skills/` source folder is **not** deployed to Foundry — only the downloaded skills are used at runtime. The provisioning step must have been run against the same Foundry project before the agent can download the skills.
@@ -1,41 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/AgentSchema/refs/heads/main/schemas/v1.0/AgentManifest.yaml
-name: hosted-agent-skills
-displayName: "Hosted Agent Skills"
-
-description: >
-  An Agent Framework agent that downloads its behavioral guidelines from the Foundry
-  Skills REST API at startup, demonstrating how to decouple behavioral guidelines
-  (tone, escalation policy, etc.) from agent code using AgentSkillsProvider.
-
-metadata:
-  tags:
-    - AI Agent Hosting
-    - Azure AI AgentServer
-    - Responses Protocol
-    - Agent Framework
-    - Agent Skills
-    - Foundry Skills
-
-template:
-  name: hosted-agent-skills
-  kind: hosted
-  protocols:
-    - protocol: responses
-      version: 1.0.0
-  resources:
-    cpu: "0.25"
-    memory: 0.5Gi
-  environment_variables:
-    - name: AZURE_AI_MODEL_DEPLOYMENT_NAME
-      value: "{{AZURE_AI_MODEL_DEPLOYMENT_NAME}}"
-    - name: SKILL_NAMES
-      value: "{{SKILL_NAMES}}"
-parameters:
-  properties:
-    - name: SKILL_NAMES
-      secret: false
-      description: Comma-separated list of Foundry skill names to download at startup (e.g., support-style,escalation-policy)
-resources:
-  - kind: model
-    id: gpt-4.1-mini
-    name: AZURE_AI_MODEL_DEPLOYMENT_NAME
@@ -1,14 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/AgentSchema/refs/heads/main/schemas/v1.0/ContainerAgent.yaml
-kind: hosted
-name: hosted-agent-skills
-protocols:
-  - protocol: responses
-    version: 1.0.0
-resources:
-  cpu: "0.25"
-  memory: 0.5Gi
-environment_variables:
-  - name: AZURE_AI_MODEL_DEPLOYMENT_NAME
-    value: ${AZURE_AI_MODEL_DEPLOYMENT_NAME}
-  - name: SKILL_NAMES
-    value: ${SKILL_NAMES}
@@ -1,100 +0,0 @@
-#requires -Version 7
-<#
-.SYNOPSIS
-  Local smoke test for the Hosted-AgentSkills sample.
-.DESCRIPTION
-  Publishes the sample, builds the contributor Docker image, runs the container, drives
-  two conversations via curl invocations, and asserts that the agent loaded the correct
-  Foundry Skill for each prompt (verified via canary tokens in the response).
-  Exits non-zero on failure.
-
-  Prerequisites:
-    - Docker
-    - az login (token is fetched from the host)
-    - .env populated with AZURE_AI_PROJECT_ENDPOINT and model deployment
-    - Skills provisioned to Foundry (set PROVISION_SAMPLE_SKILLS=true on first run)
-.NOTES
-  This script is for local Docker debugging only. The Foundry platform supplies the
-  isolation keys for every inbound request in production and the dev fallback used here
-  must not be enabled in production deployments.
-#>
-
-[CmdletBinding()]
-param(
-    [int]$Port = 8088,
-    [string]$ImageName = 'hosted-agent-skills-smoke',
-    [string]$ContainerName = 'hosted-agent-skills-smoke'
-)
-
-$ErrorActionPreference = 'Stop'
-Set-Location -Path $PSScriptRoot/..
-
-if (-not (Test-Path .env)) {
-    throw '.env not found. Copy .env.example to .env and fill in AZURE_AI_PROJECT_ENDPOINT.'
-}
-
-Write-Host '==> Publishing sample for linux-musl-x64 ...'
-dotnet publish -c Debug -f net10.0 -r linux-musl-x64 --self-contained false -o out --tl:off | Out-Host
-if ($LASTEXITCODE -ne 0) { throw 'dotnet publish failed.' }
-
-Write-Host '==> Building docker image ...'
-docker build -f Dockerfile.contributor -t $ImageName . | Out-Host
-if ($LASTEXITCODE -ne 0) { throw 'docker build failed.' }
-
-Write-Host '==> Fetching bearer token ...'
-$bearer = az account get-access-token --resource https://ai.azure.com --query accessToken -o tsv
-if (-not $bearer) { throw 'Failed to obtain bearer token. Run az login.' }
-
-function Start-Container {
-    docker rm -f $ContainerName 2>$null | Out-Null
-    docker run -d --name $ContainerName -p ${Port}:8088 `
-        -e AGENT_NAME=hosted-agent-skills `
-        -e AZURE_BEARER_TOKEN=$bearer `
-        -e HOSTED_USER_ISOLATION_KEY=smoke-user `
-        -e HOSTED_CHAT_ISOLATION_KEY=smoke-chat-1 `
-        --env-file .env `
-        $ImageName | Out-Host
-    if ($LASTEXITCODE -ne 0) { throw "docker run failed." }
-    # Wait for the server to start and download skills from Foundry.
-    Write-Host '  Waiting for startup (skill download + server ready) ...'
-    Start-Sleep -Seconds 15
-}
-
-function Invoke-Agent([string]$Prompt, [string]$PreviousResponseId = $null) {
-    $body = @{ input = $Prompt; model = 'hosted-agent-skills' }
-    if ($PreviousResponseId) { $body['previous_response_id'] = $PreviousResponseId }
-    $json = $body | ConvertTo-Json -Compress
-    $resp = Invoke-RestMethod -Method Post -Uri "http://localhost:$Port/responses" -ContentType 'application/json' -Body $json
-    return $resp
-}
-
-function Get-ResponseText($response) {
-    return ($response.output | ForEach-Object { $_.content | ForEach-Object { $_.text } }) -join ' '
-}
-
-function Assert-Contains([string]$Haystack, [string]$Needle, [string]$Label) {
-    if ($Haystack -notmatch [regex]::Escape($Needle)) {
-        throw "FAILED [$Label]: expected response to contain '$Needle' but got: $Haystack"
-    }
-    Write-Host "PASS  [$Label]: response contains '$Needle'."
-}
-
-try {
-    Start-Container
-
-    Write-Host '==> Test 1: Routine support question -> support-style skill ...'
-    $r1 = Invoke-Agent -Prompt 'Hi, I am Alex. I just want to confirm I can return my tent within 30 days.'
-    $text1 = Get-ResponseText $r1
-    Assert-Contains $text1 'STYLE-CANARY-3318' 'routine question: support-style canary'
-
-    Write-Host '==> Test 2: Escalation trigger -> escalation-policy skill ...'
-    $r2 = Invoke-Agent -Prompt 'I want a $750 refund on Order #A-1042 right now or I am calling my lawyer.'
-    $text2 = Get-ResponseText $r2
-    Assert-Contains $text2 'ESC-CANARY-7742' 'escalation trigger: escalation-policy canary'
-
-    Write-Host ''
-    Write-Host '==> All smoke assertions passed.'
-}
-finally {
-    docker rm -f $ContainerName 2>$null | Out-Null
-}
@@ -1,30 +0,0 @@
---
-name: escalation-policy
-description: When and how to escalate Contoso Outdoors customer-support tickets.
---
-
-# Contoso Outdoors Escalation Policy
-
-You must follow this escalation policy on every conversation.
-
-## Escalate immediately when the customer
-
- Reports an injury, allergic reaction, or other safety incident.
- Mentions legal action, regulators, or the press.
- Has waited more than 14 days for a refund that was already approved.
- Requests a refund larger than $500.
-
-## How to escalate
-
-1. Acknowledge the issue in one sentence.
-2. Tell the customer you are escalating to a senior specialist.
-3. Provide the escalation reference `ESC-CANARY-7742` and the SLA: a senior
-   specialist will reply within 1 business day.
-4. Do not promise a specific outcome (refund, replacement, compensation) on
-   escalated tickets — only the senior specialist can commit to one.
-
-## Do not escalate
-
- Routine returns within the standard 30-day window.
- Shipping status questions.
- Product care and usage questions.
@@ -1,25 +0,0 @@
---
-name: support-style
-description: Contoso Outdoors customer-support tone and formatting guidelines.
---
-
-# Contoso Outdoors Support Style
-
-You are speaking on behalf of Contoso Outdoors customer support.
-
-## Voice
-
- Warm, concise, and confident — never apologetic in a hand-wringing way.
- Use the customer's name when it is known.
- Sign every response with `— Contoso Outdoors Support`.
-
-## Formatting
-
- Keep replies to 1–3 short paragraphs unless the customer asks for detail.
- Use bullet lists only when enumerating concrete steps or options.
- Always reference order numbers as `Order #<id>` (e.g. `Order #A-1042`).
-
-## Canary
-
-To prove this skill was loaded, include the token `STYLE-CANARY-3318` on a
-separate line at the bottom of every response, prefixed with `# `.
@@ -27,9 +27,9 @@

  <!-- For end-users: uncomment the PackageReference below and remove the ProjectReferences above
  <ItemGroup>
-    <PackageReference Include="Microsoft.Agents.AI.Foundry" Version="1.6.1-preview.260514.1" />
-    <PackageReference Include="Microsoft.Agents.AI.Foundry.Hosting" Version="1.6.1-preview.260514.1" />
-    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.6.1" />
+    <PackageReference Include="Microsoft.Agents.AI.Foundry" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Agents.AI.Foundry.Hosting" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.0.0" />
  </ItemGroup>
  -->

@@ -23,8 +23,8 @@

  <!-- For end-users: uncomment the PackageReference below and remove the ProjectReference above
  <ItemGroup>
-    <PackageReference Include="Microsoft.Agents.AI.Foundry" Version="1.6.1-preview.260514.1" />
-    <PackageReference Include="Microsoft.Agents.AI.Foundry.Hosting" Version="1.6.1-preview.260514.1" />
+    <PackageReference Include="Microsoft.Agents.AI.Foundry" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Agents.AI.Foundry.Hosting" Version="1.0.0" />
    <PackageReference Include="Azure.AI.Projects" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>
--- a/Show More
+++ b/Show More