Inject user agent header at runtime

.devcontainer/devcontainer.json

@@ -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"

.github/.linkspector.yml

@@ -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"

.github/actions/free-runner-disk-space/action.yml

@@ -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

.github/actions/python-setup/action.yml

@@ -17,7 +17,7 @@ runs:
     using: "composite"
     steps:
       - name: Set up uv
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6
+        uses: astral-sh/setup-uv@v6
         with:
             version-file: "python/pyproject.toml"
             enable-cache: true
@@ -32,13 +32,7 @@ runs:
               if grep -q "name = \"$pkg\"" "$f"; then
                 pkg_dir=$(dirname "$f" | sed 's|python/||')
                 echo "Excluding workspace package: $pkg ($pkg_dir)"
-                if awk '/^\[tool\.uv\.workspace\]/{f=1;next} /^\[/{f=0} f && /^exclude = \[/{found=1} END{exit !found}' python/pyproject.toml; then
-                  if ! awk '/^\[tool\.uv\.workspace\]/{f=1;next} /^\[/{f=0} f && /^exclude = \[/ && index($0, "\"'"$pkg_dir"'\"")' python/pyproject.toml | grep -q .; then
-                    sed -i.bak '/\[tool\.uv\.workspace\]/,/^\[/ { /^exclude = \[/ s|\]|, "'"$pkg_dir"'"]| }' python/pyproject.toml
-                  fi
-                else
-                  sed -i.bak '/\[tool\.uv\.workspace\]/a\exclude = ["'"$pkg_dir"'"]' python/pyproject.toml
-                fi
+                sed -i.bak '/\[tool\.uv\.workspace\]/a\exclude = ["'"$pkg_dir"'"]' python/pyproject.toml
                 sed -i.bak '/'"$pkg"' = { workspace = true }/d' python/pyproject.toml
               fi
             done
@@ -46,4 +40,4 @@ runs:
       - name: Install the project
         shell: bash
         run: |
-          cd python && uv sync --all-packages --all-extras --dev --prerelease=if-necessary-or-explicit
+          cd python && uv sync --all-packages --all-extras --dev -U --prerelease=if-necessary-or-explicit

.github/actions/sample-validation-setup/action.yml

@@ -24,7 +24,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up Node.js environment
-      uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+      uses: actions/setup-node@v6
       with:
         node-version: 22
 
@@ -37,7 +37,7 @@ runs:
       run: copilot --version && copilot -p "What can you do in one sentence?"
 
     - name: Azure CLI Login
-      uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+      uses: azure/login@v2
       with:
         client-id: ${{ inputs.azure-client-id }}
         tenant-id: ${{ inputs.azure-tenant-id }}

.github/dependabot.yml

@@ -44,15 +44,9 @@ updates:
 
   # Maintain dependencies for github-actions
   - package-ecosystem: "github-actions"
-    # Cover both the standard workflow location and our composite actions.
-    # With `directory: "/"` Dependabot only scans `.github/workflows/*.{yml,yaml}`
-    # plus a root-level `action.yml/action.yaml`. It does NOT recurse into
-    # `.github/actions/*/action.yml`, so the glob below is required to keep the
-    # composite actions in `.github/actions/<name>/` up to date as well.
-    # Ref: https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#directories-or-directory--
-    directories:
-      - "/"
-      - "/.github/actions/*"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
     schedule:
       interval: "weekly"
       day: "sunday"

.github/scripts/check_team_membership.js

@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-/**
- * Resolve the issue author and check their team membership.
- *
- * @param {object} opts
- * @param {object} opts.github - Octokit REST client from actions/github-script
- * @param {object} opts.context - GitHub Actions context
- * @param {object} opts.core - GitHub Actions core toolkit
- * @param {string} opts.teamSlug - Team slug to check membership against
- * @param {string|number} opts.issueNumber - Issue number to resolve author for
- * @returns {Promise<{author: string|null, isTeamMember: boolean}>}
- */
-async function checkTeamMembership({ github, context, core, teamSlug, issueNumber }) {
-  let author = context.payload.issue?.user?.login;
-  if (!author) {
-    const { data: issue } = await github.rest.issues.get({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
-      issue_number: Number(issueNumber),
-    });
-    author = issue.user?.login;
-  }
-
-  if (!author) {
-    core.setFailed('Could not determine issue author (user may be deleted).');
-    return { author: null, isTeamMember: false };
-  }
-
-  try {
-    await github.rest.teams.getByName({
-      org: context.repo.owner,
-      team_slug: teamSlug,
-    });
-  } catch (error) {
-    core.setFailed(`Team lookup failed for ${teamSlug}: ${error.message}`);
-    throw error;
-  }
-
-  let isTeamMember = false;
-  try {
-    const teamMembership = await github.rest.teams.getMembershipForUserInOrg({
-      org: context.repo.owner,
-      team_slug: teamSlug,
-      username: author,
-    });
-    isTeamMember = teamMembership.data.state === 'active';
-  } catch (error) {
-    if (error.status === 404) {
-      core.info(`Author ${author} is not a member of team ${teamSlug}.`);
-      isTeamMember = false;
-    } else {
-      core.setFailed(`Team membership lookup failed for ${author}: ${error.message}`);
-      throw error;
-    }
-  }
-
-  return { author, isTeamMember };
-}
-
-module.exports = checkTeamMembership;

.github/scripts/pr_limit_moderation.js

@@ -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,
-};

.github/tests/test_check_team_membership.js

@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-/**
- * Tests for check_team_membership.js.
- *
- * Run with: node --test .github/tests/test_check_team_membership.js
- */
-
-const { describe, it } = require('node:test');
-const assert = require('node:assert/strict');
-
-const checkTeamMembership = require('../scripts/check_team_membership.js');
-
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function createMocks({ payloadIssue = undefined, apiUser = 'api-user', teamState = 'active' } = {}) {
-  const core = {
-    _infoMessages: [],
-    _failedMessages: [],
-    info(msg) { this._infoMessages.push(msg); },
-    setFailed(msg) { this._failedMessages.push(msg); },
-  };
-
-  const context = {
-    payload: { issue: payloadIssue },
-    repo: { owner: 'test-org', repo: 'test-repo' },
-  };
-
-  const github = {
-    rest: {
-      issues: {
-        get: async () => ({
-          data: { user: apiUser ? { login: apiUser } : null },
-        }),
-      },
-      teams: {
-        getByName: async () => ({}),
-        getMembershipForUserInOrg: async () => ({
-          data: { state: teamState },
-        }),
-      },
-    },
-  };
-
-  return { core, context, github };
-}
-
-const BASE_OPTS = { teamSlug: 'my-team', issueNumber: '123' };
-
-
-// ---------------------------------------------------------------------------
-// Author resolution
-// ---------------------------------------------------------------------------
-
-describe('author resolution', () => {
-  it('resolves author from event payload', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'payload-user' } },
-    });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.author, 'payload-user');
-  });
-
-  it('resolves author via API when payload issue is absent', async () => {
-    const { github, context, core } = createMocks({ apiUser: 'api-user' });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.author, 'api-user');
-  });
-
-  it('resolves author via API when payload issue user is null (deleted account)', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: null },
-      apiUser: 'fetched-user',
-    });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.author, 'fetched-user');
-  });
-
-  it('handles deleted account when API also returns null user', async () => {
-    const { github, context, core } = createMocks({ apiUser: null });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.author, null);
-    assert.equal(result.isTeamMember, false);
-    assert.ok(core._failedMessages.some(m => m.includes('deleted')));
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// Team lookup
-// ---------------------------------------------------------------------------
-
-describe('team lookup', () => {
-  it('fails the job when team lookup errors', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'user1' } },
-    });
-    const error = new Error('Bad credentials');
-    github.rest.teams.getByName = async () => { throw error; };
-
-    await assert.rejects(
-      () => checkTeamMembership({ github, context, core, ...BASE_OPTS }),
-      (err) => err === error,
-    );
-    assert.ok(core._failedMessages.some(m => m.includes('Team lookup failed')));
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// Team membership
-// ---------------------------------------------------------------------------
-
-describe('team membership', () => {
-  it('returns true for active team member', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'member' } },
-      teamState: 'active',
-    });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.isTeamMember, true);
-  });
-
-  it('returns false for pending team member', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'pending-user' } },
-      teamState: 'pending',
-    });
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.isTeamMember, false);
-  });
-
-  it('treats 404 membership response as non-member without failing', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'outsider' } },
-    });
-    const notFoundError = new Error('Not Found');
-    notFoundError.status = 404;
-    github.rest.teams.getMembershipForUserInOrg = async () => { throw notFoundError; };
-
-    const result = await checkTeamMembership({ github, context, core, ...BASE_OPTS });
-    assert.equal(result.isTeamMember, false);
-    assert.equal(core._failedMessages.length, 0);
-    assert.ok(core._infoMessages.some(m => m.includes('not a member')));
-  });
-
-  it('fails the job on non-404 membership errors', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'user1' } },
-    });
-    const serverError = new Error('Internal Server Error');
-    serverError.status = 500;
-    github.rest.teams.getMembershipForUserInOrg = async () => { throw serverError; };
-
-    await assert.rejects(
-      () => checkTeamMembership({ github, context, core, ...BASE_OPTS }),
-      (err) => err === serverError,
-    );
-    assert.ok(core._failedMessages.some(m => m.includes('membership lookup failed')));
-  });
-
-  it('fails the job on membership errors without status code', async () => {
-    const { github, context, core } = createMocks({
-      payloadIssue: { user: { login: 'user1' } },
-    });
-    const networkError = new Error('ECONNREFUSED');
-    github.rest.teams.getMembershipForUserInOrg = async () => { throw networkError; };
-
-    await assert.rejects(
-      () => checkTeamMembership({ github, context, core, ...BASE_OPTS }),
-      (err) => err === networkError,
-    );
-    assert.ok(core._failedMessages.some(m => m.includes('membership lookup failed')));
-  });
-});

.github/tests/test_pr_limit_moderation.js

@@ -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);
-  });
-});

.github/workflows/codeql-analysis.yml

@@ -32,13 +32,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
+        uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,6 +64,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/devflow-pr-review.yml

@@ -1,165 +0,0 @@
-name: DevFlow PR Review
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-      - ready_for_review
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: Pull request number to review
-        required: true
-        type: string
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: devflow-pr-review-${{ github.repository }}-${{ github.event.pull_request.number || inputs.pr_number || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  DEVFLOW_REPOSITORY: ${{ vars.DF_REPO }}
-  DEVFLOW_REF: main
-  TARGET_REPO_PATH: ${{ github.workspace }}/target-repo
-  DEVFLOW_PATH: ${{ github.workspace }}/devflow
-
-jobs:
-  team_check:
-    runs-on: ubuntu-latest
-    outputs:
-      is_team_member: ${{ steps.check.outputs.is_team_member }}
-      pr_number: ${{ steps.pr.outputs.pr_number }}
-      pr_url: ${{ steps.pr.outputs.pr_url }}
-      repo: ${{ steps.pr.outputs.repo }}
-    steps:
-      - name: Resolve PR metadata
-        id: pr
-        shell: bash
-        env:
-          PR_HTML_URL: ${{ github.event.pull_request.html_url }}
-          PR_NUMBER_EVENT: ${{ github.event.pull_request.number }}
-          PR_NUMBER_INPUT: ${{ inputs.pr_number }}
-        run: |
-          set -euo pipefail
-
-          if [[ "${GITHUB_EVENT_NAME}" == "pull_request_target" ]]; then
-            pr_number="${PR_NUMBER_EVENT}"
-            pr_url="${PR_HTML_URL}"
-          else
-            pr_number="${PR_NUMBER_INPUT}"
-            pr_url="https://github.com/${GITHUB_REPOSITORY}/pull/${pr_number}"
-          fi
-
-          if [[ ! "$pr_number" =~ ^[1-9][0-9]*$ ]]; then
-            echo "Could not determine PR number; for workflow_dispatch runs, the 'pr_number' input is required when not running on pull_request_target." >&2
-            exit 1
-          fi
-
-          echo "pr_url=${pr_url}" >> "$GITHUB_OUTPUT"
-          echo "pr_number=${pr_number}" >> "$GITHUB_OUTPUT"
-          echo "repo=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
-
-      - name: Check PR author team membership
-        id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        env:
-          TEAM_NAME: ${{ secrets.DEVELOPER_TEAM }}
-          PR_NUMBER: ${{ steps.pr.outputs.pr_number }}
-        with:
-          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
-          script: |
-            let author = context.payload.pull_request?.user?.login;
-            if (!author) {
-              const { data: pr } = await github.rest.pulls.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: Number(process.env.PR_NUMBER),
-              });
-              author = pr.user.login;
-            }
-
-            let isTeamMember = false;
-            try {
-              const teamMembership = await github.rest.teams.getMembershipForUserInOrg({
-                org: context.repo.owner,
-                team_slug: process.env.TEAM_NAME,
-                username: author,
-              });
-              isTeamMember = teamMembership.data.state === 'active';
-            } catch (error) {
-              console.log(`Team membership lookup failed for ${author}: ${error.message}`);
-              isTeamMember = false;
-            }
-
-            core.setOutput('is_team_member', isTeamMember ? 'true' : 'false');
-            if (isTeamMember) {
-              core.info(`Author ${author} is a team member; proceeding with review.`);
-            } else {
-              core.info(`Author ${author} is not a member of ${process.env.TEAM_NAME}; skipping review.`);
-            }
-
-  review:
-    runs-on: ubuntu-latest
-    needs: team_check
-    if: ${{ needs.team_check.outputs.is_team_member == 'true' }}
-    timeout-minutes: 60
-    # Advisory check: failures here should not block the PR. The reviewer
-    # posts comments as a best-effort signal; if the pipeline breaks, the
-    # PR author should still be able to merge without a red required check.
-    continue-on-error: true
-
-    steps:
-      # Safe checkout: base repo only, not the untrusted PR head.
-      - name: Checkout target repo base
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.base.sha || github.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-          path: target-repo
-
-      # Private DevFlow checkout: the PAT/token grants access to this repo's code.
-      - name: Checkout DevFlow
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          repository: ${{ env.DEVFLOW_REPOSITORY }}
-          ref: ${{ env.DEVFLOW_REF }}
-          token: ${{ secrets.DEVFLOW_TOKEN }}
-          fetch-depth: 1
-          persist-credentials: false
-          path: devflow
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-        with:
-          python-version: "3.13"
-
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
-        with:
-          version: "0.11.x"
-          enable-cache: true
-
-      - name: Install DevFlow dependencies
-        working-directory: ${{ env.DEVFLOW_PATH }}
-        run: uv sync --frozen
-
-      - name: Run PR review
-        id: review
-        working-directory: ${{ env.DEVFLOW_PATH }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_COPILOT_TOKEN: ${{ secrets.GH_COPILOT_TOKEN }}
-          SK_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          AGENT_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          PR_URL: ${{ needs.team_check.outputs.pr_url }}
-        run: |
-          uv run python scripts/trigger_pr_review.py \
-            --pr-url "$PR_URL" \
-            --github-username "$GITHUB_ACTOR" \
-            --no-require-comment-selection

.github/workflows/dotnet-build-and-test.yml

@@ -37,12 +37,9 @@ jobs:
     outputs:
       dotnetChanges: ${{ steps.filter.outputs.dotnet }}
       cosmosDbChanges: ${{ steps.filter.outputs.cosmosdb }}
-      foundryHostingChanges: ${{ steps.filter.outputs.foundryHosting }}
-      functionsChanged: ${{ steps.filter.outputs.functions }}
-      coreChanged: ${{ steps.filter.outputs.core }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
+      - uses: actions/checkout@v6
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
@@ -50,40 +47,6 @@ jobs:
               - 'dotnet/**'
             cosmosdb:
               - 'dotnet/src/Microsoft.Agents.AI.CosmosNoSql/**'
-            # The Foundry hosted-agent IT is costly (builds a container, pushes to ACR,
-            # provisions live agents). Only run it when the project under test, its
-            # dependency chain, the test container, the test fixture, or their tooling
-            # changed. Keep this list in sync with $hashedDirs in scripts/it-build-image.ps1.
-            foundryHosting:
-              - 'dotnet/src/Microsoft.Agents.AI.Foundry.Hosting/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Foundry/**'
-              - 'dotnet/src/Microsoft.Agents.AI/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Abstractions/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Workflows/**'
-              - 'dotnet/tests/Foundry.Hosting.IntegrationTests/**'
-              - 'dotnet/tests/Foundry.Hosting.IntegrationTests.TestContainer/**'
-              - 'dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-AzureSearchRag/**'
-              - 'dotnet/Directory.Packages.props'
-              - 'dotnet/tests/Foundry.Hosting.IntegrationTests/scripts/it-build-image.ps1'
-              - '.github/workflows/dotnet-build-and-test.yml'
-            functions:
-              - 'dotnet/src/Microsoft.Agents.AI.DurableTask/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Hosting.AzureFunctions/**'
-              - 'dotnet/tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/**'
-              - 'dotnet/tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/**'
-              - '.github/actions/azure-functions-integration-setup/**'
-              - '.github/workflows/dotnet-build-and-test.yml'
-            core:
-              - 'dotnet/src/Microsoft.Agents.AI/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Abstractions/**'
-              - 'dotnet/src/Microsoft.Agents.AI.OpenAI/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Workflows/**'
-              - 'dotnet/src/Microsoft.Agents.AI.Workflows.Generators/**'
-              - 'dotnet/eng/scripts/New-FilteredSolution.ps1'
-              - 'dotnet/tests/Directory.Build.props'
-              - 'dotnet/Directory.Packages.props'
-              - 'dotnet/global.json'
-              - '.github/workflows/dotnet-build-and-test.yml'
       # run only if 'dotnet' files were changed
       - name: dotnet tests
         if: steps.filter.outputs.dotnet == 'true'
@@ -111,7 +74,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
             persist-credentials: false
             sparse-checkout: |
@@ -121,11 +84,8 @@ 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
+        uses: actions/setup-dotnet@v5.2.0
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
       - name: Build dotnet solutions
@@ -184,7 +144,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     environment: ${{ matrix.environment }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
             persist-credentials: false
             sparse-checkout: |
@@ -194,9 +154,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)) }}
@@ -208,7 +165,7 @@ jobs:
           echo "COSMOSDB_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+        uses: actions/setup-dotnet@v5.2.0
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
 
@@ -237,11 +194,10 @@ jobs:
             Verbose         = $true
           }
           ./dotnet/eng/scripts/New-FilteredSolution.ps1 @commonArgs `
-            -TestProjectNameIncludeFilter "*UnitTests*" `
+            -TestProjectNameFilter "*UnitTests*" `
             -OutputPath dotnet/filtered-unit.slnx
           ./dotnet/eng/scripts/New-FilteredSolution.ps1 @commonArgs `
-            -TestProjectNameIncludeFilter "*IntegrationTests*" `
-            -TestProjectNameExcludeFilter "*DurableTask.IntegrationTests*","*AzureFunctions.IntegrationTests*" `
+            -TestProjectNameFilter "*IntegrationTests*" `
             -OutputPath dotnet/filtered-integration.slnx
 
       - name: Run Unit Tests
@@ -277,12 +233,20 @@ jobs:
 
       - name: Azure CLI Login
         if: github.event_name != 'pull_request' && matrix.integration-tests
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
+        # This setup action is required for both Durable Task and Azure Functions integration tests.
+        # We only run it on Ubuntu since the Durable Task and Azure Functions features are not available
+        # on .NET Framework (net472) which is what we use the Windows runner for.
+      - name: Set up Durable Task and Azure Functions Integration Test Emulators
+        if: github.event_name != 'pull_request' && matrix.integration-tests && matrix.os == 'ubuntu-latest'
+        uses: ./.github/actions/azure-functions-integration-setup
+        id: azure-functions-setup
+
       - name: Run Integration Tests
         shell: pwsh
         working-directory: dotnet
@@ -293,11 +257,8 @@ jobs:
             -c ${{ matrix.configuration }} `
             --no-build -v Normal `
             --report-xunit-trx `
-            --report-junit `
-            --results-directory ../IntegrationTestResults/ `
             --ignore-exit-code 8 `
             --filter-not-trait "Category=IntegrationDisabled" `
-            --filter-not-trait "Category=FoundryHostedAgents" `
             --parallel-algorithm aggressive `
             --max-threads 2.0x
         env:
@@ -316,15 +277,11 @@ jobs:
           AZURE_AI_PROJECT_ENDPOINT: ${{ vars.AZURE_AI_PROJECT_ENDPOINT }}
           AZURE_AI_MODEL_DEPLOYMENT_NAME: ${{ vars.AZURE_AI_MODEL_DEPLOYMENT_NAME }}
           AZURE_AI_BING_CONNECTION_ID: ${{ vars.AZURE_AI_BING_CONNECTION_ID }}
-          # Anthropic Models
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          ANTHROPIC_CHAT_MODEL_NAME: ${{ vars.ANTHROPIC_CHAT_MODEL_NAME }}
-          ANTHROPIC_REASONING_MODEL_NAME: ${{ vars.ANTHROPIC_REASONING_MODEL_NAME }}
 
       # Generate test reports and check coverage
       - name: Generate test reports
         if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
-        uses: danielpalme/ReportGenerator-GitHub-Action@2a82782178b2816d9d6960a7345fdd164791b323 # 5.5.3
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.5.3
         with:
           reports: "./TestResults/Coverage/**/*.cobertura.xml"
           targetdir: "./TestResults/Reports"
@@ -332,7 +289,7 @@ jobs:
 
       - name: Upload coverage report artifact
         if: matrix.targetFramework == env.COVERAGE_FRAMEWORK
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: CoverageReport-${{ matrix.os }}-${{ matrix.targetFramework }}-${{ matrix.configuration }} # Artifact name
           path: ./TestResults/Reports # Directory containing files to upload
@@ -342,209 +299,11 @@ jobs:
         shell: pwsh
         run: ./dotnet/eng/scripts/dotnet-check-coverage.ps1 -JsonReportPath "TestResults/Reports/Summary.json" -CoverageThreshold $env:COVERAGE_THRESHOLD
 
-      - name: Upload integration test results
-        if: always() && github.event_name != 'pull_request' && matrix.integration-tests
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: dotnet-test-results-${{ matrix.targetFramework }}-${{ matrix.os }}
-          path: IntegrationTestResults/**/*.junit
-          if-no-files-found: ignore
-
-  # The Foundry hosted-agent IT is costly (it builds a container, pushes to ACR, and provisions
-  # live agents on a separate Foundry project). Running it in its own job keeps the overall
-  # workflow time roughly flat: it executes in parallel to dotnet-build and dotnet-test and is
-  # gated on paths-filter.outputs.foundryHostingChanges so unrelated edits skip the work.
-  dotnet-foundry-hosted-it:
-    needs: paths-filter
-    if: github.event_name != 'pull_request' && needs.paths-filter.outputs.foundryHostingChanges == 'true'
-    runs-on: ubuntu-latest
-    environment: integration
-    env:
-      configuration: Release
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          persist-credentials: false
-          sparse-checkout: |
-            .
-            .github
-            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:
-          global-json-file: ${{ github.workspace }}/dotnet/global.json
-
-      # Build the test csproj directly instead of a filtered slnx + -f override.
-      # The test project pins TargetFrameworks=net10.0 and its ProjectReference closure
-      # gives MSBuild a single-rooted graph, so each multi-targeted dependency is invoked
-      # exactly once for net10.0. This avoids the MSB3026/MSB3491/MSB4018/MSB3883 file-lock
-      # collisions caused by parallel inner-builds racing on shared bin/obj output paths
-      # under the previous slnx + global TFM override approach.
-      - name: Build Foundry hosted IT (and its deps)
-        shell: bash
-        run: dotnet build dotnet/tests/Foundry.Hosting.IntegrationTests/Foundry.Hosting.IntegrationTests.csproj -c "$configuration" --warnaserror
-
-      - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-      # We rebuild and push the test container image on every IT run so framework code changes
-      # are picked up; the image tag is content-hashed across the test container source AND its
-      # framework project references, so identical content is a no-op push.
-      #
-      # The script always passes --no-dependencies to dotnet publish so publish never re-touches
-      # the framework lib DLLs the prior "Build Foundry hosted IT (and its deps)" step produced.
-      # This structurally eliminates the MSB3026 collision that VBCSCompiler from the prebuild
-      # would otherwise cause by holding file handles to those DLLs. Do not remove the prebuild
-      # step: the subsequent `dotnet test --no-build` step and the publish's ProjectReference
-      # resolution both depend on the prebuilt outputs being present.
-      - name: Build and push Foundry Hosted Agents test container
-        id: build-foundry-hosted-image
-        shell: pwsh
-        working-directory: ${{ github.workspace }}
-        run: |
-          $registry = "${{ vars.IT_HOSTED_AGENT_REGISTRY }}"
-          if ([string]::IsNullOrWhiteSpace($registry)) {
-            throw "IT_HOSTED_AGENT_REGISTRY not set in the integration environment."
-          }
-          & "${{ github.workspace }}/dotnet/tests/Foundry.Hosting.IntegrationTests/scripts/it-build-image.ps1" -Registry $registry | Tee-Object -FilePath $env:GITHUB_ENV -Append
-
-      - name: Run Foundry Hosted Agents Integration Tests
-        shell: pwsh
-        working-directory: dotnet
-        run: |
-          dotnet test --project tests/Foundry.Hosting.IntegrationTests/Foundry.Hosting.IntegrationTests.csproj `
-            -c $env:configuration `
-            --no-build -v Normal `
-            --report-xunit-trx `
-            --ignore-exit-code 8 `
-            --filter-trait "Category=FoundryHostedAgents"
-        env:
-          AZURE_AI_PROJECT_ENDPOINT: ${{ vars.IT_HOSTED_AGENT_PROJECT_ENDPOINT }}
-          AZURE_AI_MODEL_DEPLOYMENT_NAME: ${{ vars.IT_HOSTED_AGENT_MODEL_DEPLOYMENT_NAME }}
-          # Azure AI Search (for the azure-search-rag scenario). Reuses the integration
-          # environment secrets shared with python-sample-validation.yml. The index is
-          # provisioned out of band; see dotnet/tests/Foundry.Hosting.IntegrationTests/README.md
-          # for the required schema and seed content.
-          AZURE_SEARCH_ENDPOINT: ${{ secrets.AZURE_SEARCH_ENDPOINT }}
-          AZURE_SEARCH_INDEX_NAME: ${{ secrets.AZURE_SEARCH_INDEX_NAME }}
-          # IT_HOSTED_AGENT_IMAGE was exported into $GITHUB_ENV by the previous step.
-
-  # DurableTask and AzureFunctions integration tests (ubuntu/net10.0 only).
-  # Split from main dotnet-test job for path-based filtering and parallelism.
-  dotnet-test-functions:
-    needs: [paths-filter]
-    if: >
-      github.event_name != 'pull_request' &&
-      (needs.paths-filter.outputs.functionsChanged == 'true' ||
-       needs.paths-filter.outputs.coreChanged == 'true' ||
-       github.event_name == 'schedule' ||
-       github.event_name == 'workflow_dispatch')
-    runs-on: ubuntu-latest
-    environment: integration
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          persist-credentials: false
-          sparse-checkout: |
-            .
-            .github
-            dotnet
-            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:
-          global-json-file: ${{ github.workspace }}/dotnet/global.json
-
-      - name: Build functions integration test projects
-        shell: bash
-        working-directory: dotnet
-        run: |
-          dotnet build ./tests/Microsoft.Agents.AI.DurableTask.IntegrationTests -c Release -f net10.0 --warnaserror
-          dotnet build ./tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests -c Release -f net10.0 --warnaserror
-
-      - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-      - name: Set up Durable Task and Azure Functions Integration Test Emulators
-        uses: ./.github/actions/azure-functions-integration-setup
-        id: azure-functions-setup
-
-      - name: Run Functions Integration Tests
-        shell: pwsh
-        working-directory: dotnet
-        run: |
-          # Run DurableTask integration tests
-          dotnet test `
-            --project ./tests/Microsoft.Agents.AI.DurableTask.IntegrationTests `
-            -f net10.0 `
-            -c Release `
-            --no-build -v Normal `
-            --report-xunit-trx `
-            --report-junit `
-            --results-directory ../IntegrationTestResults/ `
-            --ignore-exit-code 8 `
-            --filter-not-trait "Category=IntegrationDisabled" `
-            --parallel-algorithm aggressive `
-            --max-threads 2.0x
-
-          # Run AzureFunctions integration tests
-          dotnet test `
-            --project ./tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests `
-            -f net10.0 `
-            -c Release `
-            --no-build -v Normal `
-            --report-xunit-trx `
-            --report-junit `
-            --results-directory ../IntegrationTestResults/ `
-            --ignore-exit-code 8 `
-            --filter-not-trait "Category=IntegrationDisabled" `
-            --parallel-algorithm aggressive `
-            --max-threads 2.0x
-        env:
-          # OpenAI Models
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          OPENAI_CHAT_MODEL_NAME: ${{ vars.OPENAI_CHAT_MODEL_NAME }}
-          OPENAI_REASONING_MODEL_NAME: ${{ vars.OPENAI_REASONING_MODEL_NAME }}
-          # Azure OpenAI Models
-          AZURE_OPENAI_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME }}
-          AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME }}
-          AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
-          # Azure AI Foundry
-          AZURE_AI_PROJECT_ENDPOINT: ${{ vars.AZURE_AI_PROJECT_ENDPOINT }}
-          AZURE_AI_MODEL_DEPLOYMENT_NAME: ${{ vars.AZURE_AI_MODEL_DEPLOYMENT_NAME }}
-          AZURE_AI_BING_CONNECTION_ID: ${{ vars.AZURE_AI_BING_CONNECTION_ID }}
-
-      - name: Upload functions test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: dotnet-test-results-functions-net10.0-ubuntu-latest
-          path: IntegrationTestResults/**/*.junit
-          if-no-files-found: ignore
-
   # This final job is required to satisfy the merge queue. It must only run (or succeed) if no tests failed
   dotnet-build-and-test-check:
     if: always()
     runs-on: ubuntu-latest
-    needs: [dotnet-build, dotnet-test, dotnet-foundry-hosted-it, dotnet-test-functions]
+    needs: [dotnet-build, dotnet-test]
     steps:
       - name: Get Date
         shell: bash
@@ -572,74 +331,13 @@ jobs:
       - name: Fail workflow if tests failed
         id: check_tests_failed
         if: contains(join(needs.*.result, ','), 'failure')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Failed!')
 
       - name: Fail workflow if tests cancelled
         id: check_tests_cancelled
         if: contains(join(needs.*.result, ','), 'cancelled')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Cancelled!')
-
-  # Integration test trend report (aggregates JUnit XML results from dotnet test jobs)
-  dotnet-integration-test-report:
-    name: Integration Test Report
-    if: >
-      always() &&
-      github.event_name != 'pull_request' &&
-      (contains(join(needs.*.result, ','), 'success') ||
-       contains(join(needs.*.result, ','), 'failure'))
-    needs: [dotnet-test, dotnet-test-functions]
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          persist-credentials: false
-          sparse-checkout: |
-            .github/actions/python-setup
-            python
-      - name: Set up python and install the project
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: "3.13"
-          os: ${{ runner.os }}
-      - name: Download all test results from current run
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          pattern: dotnet-test-results-*
-          path: dotnet-test-results/
-      - name: Restore report history cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/dotnet-integration-report-history.json
-          key: dotnet-integration-report-history-${{ github.run_id }}
-          restore-keys: |
-            dotnet-integration-report-history-
-      - name: Generate trend report
-        run: >
-          uv run python scripts/integration_test_report/aggregate.py
-          ../dotnet-test-results/
-          dotnet-integration-report-history.json
-          dotnet-integration-test-report.md
-      - name: Post to Job Summary
-        if: always()
-        run: cat dotnet-integration-test-report.md >> $GITHUB_STEP_SUMMARY
-      - name: Save report history cache
-        if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/dotnet-integration-report-history.json
-          key: dotnet-integration-report-history-${{ github.run_id }}
-      - name: Upload trend report
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: dotnet-integration-test-report
-          path: |
-            python/dotnet-integration-test-report.md
-            python/dotnet-integration-report-history.json

.github/workflows/dotnet-format.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -42,7 +42,7 @@ jobs:
       - name: Get changed files
         id: changed-files
         if: github.event_name == 'pull_request'
-        uses: jitterbit/get-changed-files@b17fbb00bdc0c0f63fcf166580804b4d2cdc2a42 # v1
+        uses: jitterbit/get-changed-files@v1
         continue-on-error: true
 
       - name: No C# files changed

.github/workflows/dotnet-integration-tests.yml

@@ -29,7 +29,7 @@ jobs:
     environment: integration
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -50,7 +50,7 @@ jobs:
           echo "COSMOS_EMULATOR_AVAILABLE=true" >> $env:GITHUB_ENV
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+        uses: actions/setup-dotnet@v5.2.0
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
 
@@ -63,7 +63,7 @@ jobs:
           done
 
       - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}

.github/workflows/dotnet-verify-samples.yml

@@ -41,7 +41,7 @@ jobs:
     environment: 'integration'
     timeout-minutes: 90
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           sparse-checkout: |
@@ -52,13 +52,13 @@ jobs:
             declarative-agents
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
+        uses: actions/setup-dotnet@v5.2.0
         with:
           global-json-file: ${{ github.workspace }}/dotnet/global.json
 
       - name: Azure CLI Login
         if: github.event_name != 'pull_request'
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -123,7 +123,7 @@ jobs:
 
       - name: Upload results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: verify-samples-results
           path: |

.github/workflows/issue-triage.yml

@@ -1,199 +0,0 @@
-name: Issue Triage
-
-on:
-  issues:
-    types: [opened, labeled]
-
-permissions:
-  contents: read
-  issues: write
-  id-token: write
-
-concurrency:
-  group: >-
-    issue-triage-${{ github.repository }}-${{
-      ((github.event.action == 'opened' && contains(github.event.issue.labels.*.name, 'bug'))
-       || (github.event.action == 'labeled' && github.event.label.name == 'bug'))
-      && github.event.issue.number
-      || github.run_id
-    }}
-  cancel-in-progress: true
-
-env:
-  DEVFLOW_REPOSITORY: ${{ vars.DF_REPO }}
-  DEVFLOW_REF: main
-  TARGET_REPO_PATH: ${{ github.workspace }}/target-repo
-  DEVFLOW_PATH: ${{ github.workspace }}/devflow
-
-jobs:
-  team_check:
-    runs-on: ubuntu-latest
-    if: ${{ (github.event.action == 'opened' && contains(github.event.issue.labels.*.name, 'bug')) || (github.event.action == 'labeled' && github.event.label.name == 'bug') }}
-    outputs:
-      is_team_member: ${{ steps.check.outputs.is_team_member }}
-      issue_number: ${{ steps.issue.outputs.issue_number }}
-      repo: ${{ steps.issue.outputs.repo }}
-    steps:
-      - name: Resolve issue metadata
-        id: issue
-        shell: bash
-        env:
-          ISSUE_NUMBER_EVENT: ${{ github.event.issue.number }}
-        run: |
-          set -euo pipefail
-
-          issue_number="${ISSUE_NUMBER_EVENT}"
-
-          if [[ ! "$issue_number" =~ ^[1-9][0-9]*$ ]]; then
-            echo "Could not determine issue number from event payload." >&2
-            exit 1
-          fi
-
-          echo "issue_number=${issue_number}" >> "$GITHUB_OUTPUT"
-          echo "repo=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
-
-      - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          sparse-checkout: .github/scripts
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: Check issue author team membership
-        id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        env:
-          TEAM_NAME: ${{ secrets.DEVELOPER_TEAM }}
-          ISSUE_NUMBER: ${{ steps.issue.outputs.issue_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.ISSUE_NUMBER,
-            });
-            core.setOutput('is_team_member', isTeamMember ? 'true' : 'false');
-            if (isTeamMember) {
-              core.info(`Author ${author} is a team member; skipping auto-triage.`);
-            } else {
-              core.info(`Author ${author} is not a team member; proceeding with triage.`);
-            }
-
-  triage:
-    runs-on: ubuntu-latest
-    needs: team_check
-    if: ${{ needs.team_check.outputs.is_team_member == 'false' }}
-    environment: integration
-    timeout-minutes: 60
-
-    steps:
-      # Safe checkout: base repo only.
-      - name: Checkout target repo base
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-          path: target-repo
-
-      # Private DevFlow (maf-dashboard) checkout.
-      - name: Checkout DevFlow
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          repository: ${{ env.DEVFLOW_REPOSITORY }}
-          ref: ${{ env.DEVFLOW_REF }}
-          token: ${{ secrets.DEVFLOW_TOKEN }}
-          fetch-depth: 1
-          persist-credentials: false
-          path: devflow
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-        with:
-          python-version: "3.13"
-
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
-        with:
-          version: "0.11.x"
-          enable-cache: true
-
-      - name: Install DevFlow dependencies
-        working-directory: ${{ env.DEVFLOW_PATH }}
-        run: uv sync --frozen
-
-      - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-      - name: Classify issue relevance
-        id: spam
-        working-directory: ${{ env.DEVFLOW_PATH }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DEVFLOW_TOKEN: ${{ secrets.DEVFLOW_TOKEN }}
-          SK_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          AGENT_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          ISSUE_REPO: ${{ needs.team_check.outputs.repo }}
-          ISSUE_NUMBER: ${{ needs.team_check.outputs.issue_number }}
-        run: |
-          uv run python scripts/classify_issue_spam.py \
-            --repo "$ISSUE_REPO" \
-            --issue-number "$ISSUE_NUMBER" \
-            --repo-path "${TARGET_REPO_PATH}" \
-            --apply-labels
-
-      - name: Stop after spam gate
-        if: ${{ steps.spam.outputs.allow_triage != 'true' }}
-        shell: bash
-        run: |
-          echo "Stopping: issue triage preflight did not allow automation."
-          exit 1
-
-      - name: Reproduce reported issue
-        if: ${{ steps.spam.outputs.allow_triage == 'true' }}
-        id: repro
-        working-directory: ${{ env.DEVFLOW_PATH }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_COPILOT_TOKEN: ${{ secrets.GH_COPILOT_TOKEN }}
-          # Not seen by the agent prompt; used only to push a paper-trail
-          # branch back to maf-dashboard at run end.
-          DEVFLOW_TOKEN: ${{ secrets.DEVFLOW_TOKEN }}
-          SK_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          AGENT_REPO_PATH: ${{ env.TARGET_REPO_PATH }}
-          ISSUE_REPO: ${{ needs.team_check.outputs.repo }}
-          ISSUE_NUMBER: ${{ needs.team_check.outputs.issue_number }}
-          # Model-provider settings for generated repro code. Never enter the
-          # agent prompt; consumed by SDK constructors via os.environ. Azure
-          # OpenAI and Foundry auth via AAD from the azure/login step above.
-          OPENAI_API_KEY: ${{ secrets.OPENAI__APIKEY }}
-          OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.OPENAI__CHATMODELID }}
-          OPENAI_CHAT_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
-          OPENAI_MODEL: ${{ vars.OPENAI__RESPONSESMODELID }}
-          OPENAI_EMBEDDING_MODEL: ${{ vars.OPENAI_EMBEDDING_MODEL_ID }}
-          AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
-          AZURE_OPENAI_CHAT_COMPLETION_MODEL: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
-          AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-          AZURE_OPENAI_MODEL: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
-          AZURE_OPENAI_EMBEDDING_MODEL: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME }}
-          FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
-          FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
-          FOUNDRY_AGENT_NAME: ${{ vars.FOUNDRY_AGENT_NAME }}
-          FOUNDRY_AGENT_VERSION: ${{ vars.FOUNDRY_AGENT_VERSION }}
-          FOUNDRY_MODELS_ENDPOINT: ${{ vars.FOUNDRY_MODELS_ENDPOINT || '' }}
-          FOUNDRY_MODELS_API_KEY: ${{ secrets.FOUNDRY_MODELS_API_KEY || '' }}
-          FOUNDRY_EMBEDDING_MODEL: ${{ vars.FOUNDRY_EMBEDDING_MODEL || '' }}
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          ANTHROPIC_CHAT_MODEL: ${{ vars.ANTHROPIC_CHAT_MODEL_ID }}
-        run: |
-          uv run python scripts/trigger_issue_repro.py \
-            --repo "$ISSUE_REPO" \
-            --issue-number "$ISSUE_NUMBER" \
-            --github-username "$GITHUB_ACTOR"

.github/workflows/label-issues.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+      - uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           script: |

.github/workflows/label-pr.yml

@@ -16,6 +16,6 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6
+      - uses: actions/labeler@v6
         with:
           repo-token: "${{ secrets.GH_ACTIONS_PR_WRITE }}"

.github/workflows/label-title-prefix.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+      - uses: actions/github-script@v8
         name: "Issue/PR: update title"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/limit-community-prs.yml

@@ -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,
-            });

.github/workflows/markdown-link-check.yml

@@ -19,21 +19,13 @@ jobs:
     runs-on: ubuntu-22.04
     # check out the latest version of the code
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         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
+        uses: umbrelladocs/action-linkspector@v1
         with:
           reporter: local
           filter_mode: nofilter

.github/workflows/merge-gatekeeper.yml

@@ -2,7 +2,7 @@ name: Merge Gatekeeper
 
 on:
   pull_request:
-    branches: ["main", "feature*"]
+    branches: [ "main", "feature*" ]
   merge_group:
     branches: ["main"]
 
@@ -13,105 +13,23 @@ concurrency:
 jobs:
   merge-gatekeeper:
     runs-on: ubuntu-latest
+    # Restrict permissions of the GITHUB_TOKEN.
+    # Docs: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
     permissions:
       checks: read
       statuses: read
     steps:
-      - name: Wait for required checks
+      - name: Run Merge Gatekeeper
+        # NOTE: v1 is updated to reflect the latest v1.x.y. Please use any tag/branch that suits your needs:
+        #       https://github.com/upsidr/merge-gatekeeper/tags
+        #       https://github.com/upsidr/merge-gatekeeper/branches
+        uses: upsidr/merge-gatekeeper@v1
         if: github.event_name == 'pull_request'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        env:
-          TIMEOUT_SECONDS: "3600"
-          INTERVAL_SECONDS: "30"
-          SELF_JOB_NAME: ${{ github.job }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          timeout: 3600
+          interval: 30
           # "Cleanup artifacts", "Agent", "Prepare", and "Upload results" are check runs
           # created by an org-level GitHub App (MSDO), not by any workflow in this repo.
           # They are outside our control and their transient failures should not block merges.
-          IGNORED_NAMES: "CodeQL,CodeQL analysis (csharp),Cleanup artifacts,Agent,Prepare,Upload results"
-        with:
-          script: |
-            const timeoutSeconds = Number(process.env.TIMEOUT_SECONDS);
-            const intervalSeconds = Number(process.env.INTERVAL_SECONDS);
-            const selfName = process.env.SELF_JOB_NAME;
-            const ignored = new Set(
-              process.env.IGNORED_NAMES.split(',').map((s) => s.trim()).filter(Boolean),
-            );
-
-            const sha = context.payload.pull_request.head.sha;
-            const { owner, repo } = context.repo;
-
-            const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-
-            // Mirrors upsidr/merge-gatekeeper: merge combined-statuses and check-runs
-            // for the PR head SHA, with combined-statuses winning on name collision.
-            async function collectChecks() {
-              const merged = new Map();
-
-              const combined = await github.rest.repos.getCombinedStatusForRef({
-                owner, repo, ref: sha, per_page: 100,
-              });
-              for (const s of combined.data.statuses ?? []) {
-                if (!merged.has(s.context)) {
-                  // Combined-status states: success | pending | error | failure
-                  merged.set(s.context, { name: s.context, state: s.state });
-                }
-              }
-
-              const runs = await github.paginate(github.rest.checks.listForRef, {
-                owner, repo, ref: sha, per_page: 100,
-              });
-              for (const r of runs) {
-                if (merged.has(r.name)) continue;
-                let state;
-                if (r.status !== 'completed') {
-                  state = 'pending';
-                } else if (r.conclusion === 'skipped') {
-                  continue; // Skipped runs are dropped, matching the original action.
-                } else if (r.conclusion === 'success' || r.conclusion === 'neutral') {
-                  state = 'success';
-                } else {
-                  // cancelled | timed_out | action_required | stale | failure
-                  state = 'error';
-                }
-                merged.set(r.name, { name: r.name, state });
-              }
-
-              return [...merged.values()];
-            }
-
-            function evaluate(entries) {
-              const failed = [];
-              const pending = [];
-              const succeeded = [];
-              for (const e of entries) {
-                if (e.name === selfName || ignored.has(e.name)) continue;
-                if (e.state === 'success') succeeded.push(e.name);
-                else if (e.state === 'error' || e.state === 'failure') failed.push(e.name);
-                else pending.push(e.name);
-              }
-              return { failed, pending, succeeded };
-            }
-
-            const deadline = Date.now() + timeoutSeconds * 1000;
-            for (;;) {
-              const entries = await collectChecks();
-              const { failed, pending, succeeded } = evaluate(entries);
-
-              core.info(
-                `succeeded=${succeeded.length} pending=${pending.length} failed=${failed.length}`,
-              );
-              if (failed.length) {
-                core.setFailed(`Failing checks: ${failed.join(', ')}`);
-                return;
-              }
-              if (pending.length === 0) {
-                core.info(`All required checks passed: ${succeeded.join(', ') || '(none)'}`);
-                return;
-              }
-              if (Date.now() > deadline) {
-                core.setFailed(`Timed out waiting for: ${pending.join(', ')}`);
-                return;
-              }
-              core.info(`Waiting on (${pending.length}): ${pending.slice(0, 10).join(', ')}${pending.length > 10 ? ', …' : ''}`);
-              await sleep(intervalSeconds * 1000);
-            }
+          ignored: CodeQL,CodeQL analysis (csharp),Cleanup artifacts,Agent,Prepare,Upload results

.github/workflows/python-code-quality.yml

@@ -27,7 +27,7 @@ jobs:
     env:
       UV_PYTHON: ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up python and install the project
@@ -38,11 +38,11 @@ jobs:
           os: ${{ runner.os }}
         env:
           UV_CACHE_DIR: /tmp/.uv-cache
-      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      - uses: actions/cache@v5
         with:
           path: ~/.cache/prek
           key: prek|${{ matrix.python-version }}|${{ hashFiles('python/.pre-commit-config.yaml') }}
-      - uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1
+      - uses: j178/prek-action@v1
         name: Run Pre-commit Hooks (excluding poe-check)
         env:
           SKIP: poe-check
@@ -64,7 +64,7 @@ jobs:
     env:
       UV_PYTHON: ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up python and install the project
@@ -93,7 +93,7 @@ jobs:
     env:
       UV_PYTHON: ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up python and install the project
@@ -124,7 +124,7 @@ jobs:
     env:
       UV_PYTHON: ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up python and install the project

.github/workflows/python-dependency-range-validation.yml

@@ -22,7 +22,7 @@ jobs:
       UV_PYTHON: "3.13"
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -44,7 +44,7 @@ jobs:
       - name: Upload dependency range report
         # Always publish the report so failures are inspectable even when validation fails.
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: dependency-range-results
           path: python/scripts/dependencies/dependency-range-results.json
@@ -53,7 +53,7 @@ jobs:
       - name: Create issues for failed dependency candidates
         # Always process the report so failed candidates create actionable tracking issues.
         if: always()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: |
             const fs = require("fs")

.github/workflows/python-dev-dependency-upgrade.yml

@@ -18,7 +18,7 @@ jobs:
       UV_PYTHON: "3.13"
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/python-docs.yml

@@ -24,9 +24,9 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
+        uses: astral-sh/setup-uv@v7
         with:
           version-file: "python/pyproject.toml"
           enable-cache: true

.github/workflows/python-integration-tests.yml

@@ -36,7 +36,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -69,7 +69,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -87,14 +87,6 @@ jobs:
           -n logical --dist worksteal
           --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-openai
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Azure OpenAI integration tests
   python-tests-azure-openai:
@@ -112,7 +104,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -123,7 +115,7 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -138,14 +130,6 @@ jobs:
           -n logical --dist worksteal
           --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-azure-openai
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Misc integration tests (Anthropic, Hyperlight, Ollama, MCP)
   python-tests-misc-integration:
@@ -157,13 +141,11 @@ jobs:
       ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
       ANTHROPIC_CHAT_MODEL: ${{ vars.ANTHROPIC_CHAT_MODEL_ID }}
       LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
-      OLLAMA_MODEL: qwen2.5:1.5b
-      OLLAMA_EMBEDDING_MODEL: nomic-embed-text
     defaults:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -173,43 +155,6 @@ jobs:
         with:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
-      - name: Install Ollama
-        run: curl -fsSL https://ollama.com/install.sh | sh
-        working-directory: .
-      - name: Cache Ollama models
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: ~/.ollama/models
-          key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
-      - name: Start Ollama and pull models
-        run: |
-          # Stop any Ollama instance auto-started by the install script
-          pkill ollama || true
-          sleep 2
-          ollama serve &
-          for i in $(seq 1 30); do
-            if curl -sf http://localhost:11434/api/tags > /dev/null 2>&1; then
-              break
-            fi
-            sleep 1
-          done
-          # Pull models with retry for transient 429 rate limits
-          for model in qwen2.5:1.5b nomic-embed-text; do
-            pulled=false
-            for attempt in 1 2 3; do
-              if ollama pull "$model"; then
-                pulled=true
-                break
-              fi
-              echo "Retry $attempt for $model (waiting 15s)..."
-              sleep 15
-            done
-            if [ "$pulled" != "true" ]; then
-              echo "ERROR: Failed to pull $model after 3 attempts"
-              exit 1
-            fi
-          done
-        working-directory: .
       - name: Start local MCP server
         id: local-mcp
         uses: ./.github/actions/setup-local-mcp-server
@@ -228,14 +173,6 @@ jobs:
           -n logical --dist worksteal
           --timeout=120 --session-timeout=900 --timeout_method thread
           --retries 2 --retry-delay 30
-          --junitxml=pytest.xml
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-misc
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
       - name: Stop local MCP server
         if: always()
         shell: bash
@@ -283,7 +220,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -294,7 +231,7 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -310,16 +247,8 @@ jobs:
           -m integration
           -n logical --dist worksteal
           -x
-          --timeout=480 --session-timeout=900 --timeout_method thread
+          --timeout=360 --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-functions
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Foundry integration tests
   python-tests-foundry:
@@ -341,7 +270,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -352,7 +281,7 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -366,61 +295,6 @@ jobs:
           -n logical --dist worksteal
           --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-foundry
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
-  # Foundry Hosting integration tests
-  python-tests-foundry-hosting:
-    name: Python Integration Tests - Foundry Hosting
-    runs-on: ubuntu-latest
-    environment: integration
-    timeout-minutes: 60
-    env:
-      FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
-      FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
-    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: Azure CLI Login
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Test with pytest (Foundry Hosting integration)
-        timeout-minutes: 15
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/foundry_hosting/tests
-          -m integration
-          -n logical --dist worksteal
-          --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-foundry-hosting
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Azure Cosmos integration tests
   python-tests-cosmos:
@@ -443,7 +317,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -465,121 +339,7 @@ jobs:
           echo "Cosmos DB emulator did not become ready in time." >&2
           exit 1
       - name: Test with pytest (Cosmos integration)
-        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5 --junitxml=${{ github.workspace }}/python/pytest.xml
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-cosmos
-          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
-    if: >
-      always() &&
-      (contains(join(needs.*.result, ','), 'success') ||
-       contains(join(needs.*.result, ','), 'failure'))
-    needs:
-      [
-        python-tests-openai,
-        python-tests-azure-openai,
-        python-tests-misc-integration,
-        python-tests-functions,
-        python-tests-foundry,
-        python-tests-foundry-hosting,
-        python-tests-cosmos,
-        python-tests-github-copilot,
-      ]
-    runs-on: ubuntu-latest
-    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
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Download all test results from current run
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          pattern: test-results-*
-          path: test-results/
-      - name: Restore report history cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/integration-report-history.json
-          key: integration-report-history-integration-${{ github.run_id }}
-          restore-keys: |
-            integration-report-history-integration-
-      - name: Generate trend report
-        run: >
-          uv run python scripts/integration_test_report/aggregate.py
-          ../test-results/
-          integration-report-history.json
-          integration-test-report.md
-      - name: Post to Job Summary
-        if: always()
-        run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
-      - name: Save report history cache
-        if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/integration-report-history.json
-          key: integration-report-history-integration-${{ github.run_id }}
-      - name: Upload unified trend report
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: integration-test-report
-          path: |
-            python/integration-test-report.md
-            python/integration-report-history.json
+        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5
 
   python-integration-tests-check:
     if: always()
@@ -592,19 +352,17 @@ jobs:
         python-tests-misc-integration,
         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
         if: contains(join(needs.*.result, ','), 'failure')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Failed!')
 
       - name: Fail workflow if tests cancelled
         if: contains(join(needs.*.result, ','), 'cancelled')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Cancelled!')

.github/workflows/python-lab-tests.yml

@@ -24,8 +24,8 @@ jobs:
     outputs:
       pythonChanges: ${{ steps.filter.outputs.python}}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
+      - uses: actions/checkout@v6
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
@@ -59,7 +59,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Set up python and install the project
         id: python-setup
@@ -94,7 +94,7 @@ jobs:
       # Surface failing tests
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/packages/lab/**.xml
           summary: true

.github/workflows/python-merge-tests.yml

@@ -38,12 +38,10 @@ jobs:
       miscChanged: ${{ steps.filter.outputs.misc }}
       functionsChanged: ${{ steps.filter.outputs.functions }}
       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
+      - uses: actions/checkout@v6
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
@@ -82,12 +80,8 @@ jobs:
               - 'python/packages/foundry/**'
               - 'python/samples/**/providers/foundry/**'
               - 'python/samples/02-agents/embeddings/foundry_embeddings.py'
-            foundry_hosting:
-              - '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'
@@ -109,7 +103,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -126,7 +120,7 @@ jobs:
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
@@ -156,7 +150,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -180,20 +174,13 @@ jobs:
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: OpenAI integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-openai
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Azure OpenAI integration tests
   python-tests-azure-openai:
@@ -217,7 +204,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -226,7 +213,7 @@ jobs:
           os: ${{ runner.os }}
       - name: Azure CLI Login
         if: github.event_name != 'pull_request'
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -250,20 +237,13 @@ jobs:
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: Azure OpenAI integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-azure-openai
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Misc integration tests (Anthropic, Ollama, MCP)
   python-tests-misc-integration:
@@ -281,56 +261,17 @@ jobs:
       ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
       ANTHROPIC_CHAT_MODEL: ${{ vars.ANTHROPIC_CHAT_MODEL_ID }}
       LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
-      OLLAMA_MODEL: qwen2.5:1.5b
-      OLLAMA_EMBEDDING_MODEL: nomic-embed-text
     defaults:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@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: Install Ollama
-        run: curl -fsSL https://ollama.com/install.sh | sh
-        working-directory: .
-      - name: Cache Ollama models
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: ~/.ollama/models
-          key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
-      - name: Start Ollama and pull models
-        run: |
-          # Stop any Ollama instance auto-started by the install script
-          pkill ollama || true
-          sleep 2
-          ollama serve &
-          for i in $(seq 1 30); do
-            if curl -sf http://localhost:11434/api/tags > /dev/null 2>&1; then
-              break
-            fi
-            sleep 1
-          done
-          # Pull models with retry for transient 429 rate limits
-          for model in qwen2.5:1.5b nomic-embed-text; do
-            pulled=false
-            for attempt in 1 2 3; do
-              if ollama pull "$model"; then
-                pulled=true
-                break
-              fi
-              echo "Retry $attempt for $model (waiting 15s)..."
-              sleep 15
-            done
-            if [ "$pulled" != "true" ]; then
-              echo "ERROR: Failed to pull $model after 3 attempts"
-              exit 1
-            fi
-          done
-        working-directory: .
       - name: Start local MCP server
         id: local-mcp
         uses: ./.github/actions/setup-local-mcp-server
@@ -373,20 +314,13 @@ jobs:
           kill -KILL -- "-$server_pid" 2>/dev/null || kill -KILL "$server_pid" 2>/dev/null || true
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: Misc integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-misc
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # Azure Functions + Durable Task integration tests
   python-tests-functions:
@@ -420,7 +354,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -429,7 +363,7 @@ jobs:
           os: ${{ runner.os }}
       - name: Azure CLI Login
         if: github.event_name != 'pull_request'
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -445,26 +379,19 @@ jobs:
           -m integration
           -n logical --dist worksteal
           -x
-          --timeout=480 --session-timeout=900 --timeout_method thread
+          --timeout=360 --session-timeout=900 --timeout_method thread
           --retries 2 --retry-delay 5
           --junitxml=pytest.xml
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: Functions integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-functions
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   python-tests-foundry:
     name: Python Integration Tests - Foundry
@@ -482,16 +409,12 @@ jobs:
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       FOUNDRY_AGENT_NAME: ${{ vars.FOUNDRY_AGENT_NAME }}
       FOUNDRY_AGENT_VERSION: ${{ vars.FOUNDRY_AGENT_VERSION }}
-      FOUNDRY_MODELS_ENDPOINT: ${{ vars.FOUNDRY_MODELS_ENDPOINT || '' }}
-      FOUNDRY_MODELS_API_KEY: ${{ secrets.FOUNDRY_MODELS_API_KEY || '' }}
-      FOUNDRY_EMBEDDING_MODEL: ${{ vars.FOUNDRY_EMBEDDING_MODEL || '' }}
-      FOUNDRY_IMAGE_EMBEDDING_MODEL: ${{ vars.FOUNDRY_IMAGE_EMBEDDING_MODEL || '' }}
       LOCAL_MCP_URL: ${{ vars.LOCAL_MCP__URL }}
     defaults:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -500,7 +423,7 @@ jobs:
           os: ${{ runner.os }}
       - name: Azure CLI Login
         if: github.event_name != 'pull_request'
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -518,81 +441,13 @@ jobs:
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: Test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-foundry
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
-  # Foundry Hosting integration tests
-  python-tests-foundry-hosting:
-    name: Python Tests - Foundry Hosting 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.foundryHostingChanged == 'true' ||
-       needs.paths-filter.outputs.coreChanged == 'true')
-    runs-on: ubuntu-latest
-    environment: integration
-    env:
-      FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
-      FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
-    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: Azure CLI Login
-        if: github.event_name != 'pull_request'
-        uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Test with pytest (Foundry Hosting integration)
-        timeout-minutes: 15
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/foundry_hosting/tests
-          -m integration
-          -n logical --dist worksteal
-          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
-        working-directory: ./python
-      - 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: Foundry Hosting integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-foundry-hosting
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
 
   # TODO: Add python-tests-lab
 
@@ -623,7 +478,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -642,141 +497,17 @@ jobs:
           echo "Cosmos DB emulator did not become ready in time." >&2
           exit 1
       - name: Test with pytest (Cosmos integration)
-        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5 --junitxml=${{ github.workspace }}/python/pytest.xml
+        run: uv run --directory packages/azure-cosmos poe integration-tests -n logical --dist worksteal --timeout=120 --session-timeout=900 --timeout_method thread --retries 2 --retry-delay 5 --junitxml=pytest.xml
         working-directory: ./python
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true
           display-options: fEX
           fail-on-empty: false
           title: Cosmos integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-cosmos
-          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
-    if: >
-      always() &&
-      (contains(join(needs.*.result, ','), 'success') ||
-       contains(join(needs.*.result, ','), 'failure'))
-    needs:
-      [
-        python-tests-openai,
-        python-tests-azure-openai,
-        python-tests-misc-integration,
-        python-tests-functions,
-        python-tests-foundry,
-        python-tests-foundry-hosting,
-        python-tests-cosmos,
-        python-tests-github-copilot,
-      ]
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - name: Set up python and install the project
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Download all test results from current run
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
-        with:
-          pattern: test-results-*
-          path: test-results/
-      - name: Restore report history cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/integration-report-history.json
-          key: integration-report-history-merge-${{ github.run_id }}
-          restore-keys: |
-            integration-report-history-merge-
-      - name: Generate trend report
-        run: >
-          uv run python scripts/integration_test_report/aggregate.py
-          ../test-results/
-          integration-report-history.json
-          integration-test-report.md
-      - name: Post to Job Summary
-        if: always()
-        run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
-      - name: Save report history cache
-        if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: python/integration-report-history.json
-          key: integration-report-history-merge-${{ github.run_id }}
-      - name: Upload unified trend report
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: integration-test-report
-          path: |
-            python/integration-test-report.md
-            python/integration-report-history.json
 
   python-integration-tests-check:
     if: always()
@@ -789,21 +520,19 @@ jobs:
         python-tests-misc-integration,
         python-tests-functions,
         python-tests-foundry,
-        python-tests-foundry-hosting,
         python-tests-cosmos,
-        python-tests-github-copilot,
       ]
     steps:
       - name: Fail workflow if tests failed
         id: check_tests_failed
         if: contains(join(needs.*.result, ','), 'failure')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Failed!')
 
       - name: Fail workflow if tests cancelled
         id: check_tests_cancelled
         if: contains(join(needs.*.result, ','), 'cancelled')
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         with:
           script: core.setFailed('Integration Tests Cancelled!')

.github/workflows/python-release.yml

@@ -23,7 +23,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -56,7 +56,7 @@ jobs:
       - name: Build the package
         run: uv run poe --directory packages/${{ env.PACKAGE }} build
       - name: Release
-        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             python/dist/*

.github/workflows/python-sample-validation.yml

@@ -29,7 +29,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -49,7 +49,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 01-get-started --save-report --report-name 01-get-started
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-01-get-started
@@ -82,7 +82,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -111,7 +111,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents --exclude providers --save-report --report-name 02-agents
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents
@@ -130,7 +130,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -152,7 +152,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/openai --save-report --report-name 02-agents-openai
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-openai
@@ -170,7 +170,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -191,7 +191,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/azure --save-report --report-name 02-agents-azure
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-azure
@@ -208,7 +208,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -228,7 +228,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/anthropic --save-report --report-name 02-agents-anthropic
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-anthropic
@@ -242,7 +242,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -257,7 +257,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/github_copilot --save-report --report-name 02-agents-github-copilot
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-github-copilot
@@ -274,7 +274,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -289,7 +289,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/amazon --save-report --report-name 02-agents-amazon
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-amazon
@@ -306,7 +306,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -321,7 +321,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/ollama --save-report --report-name 02-agents-ollama
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-ollama
@@ -341,7 +341,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -363,7 +363,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/foundry --save-report --report-name 02-agents-foundry
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-foundry
@@ -383,7 +383,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -405,7 +405,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/copilotstudio --save-report --report-name 02-agents-copilotstudio
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-copilotstudio
@@ -419,7 +419,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -434,7 +434,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 02-agents/providers/custom --save-report --report-name 02-agents-custom
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-02-agents-custom
@@ -451,7 +451,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -471,7 +471,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 03-workflows --save-report --report-name 03-workflows
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-03-workflows
@@ -491,7 +491,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -506,7 +506,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 04-hosting --save-report --report-name 04-hosting
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-04-hosting
@@ -534,7 +534,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -549,7 +549,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir 05-end-to-end --save-report --report-name 05-end-to-end
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-05-end-to-end
@@ -574,7 +574,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -599,7 +599,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir autogen-migration --save-report --report-name autogen-migration
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-autogen-migration
@@ -633,7 +633,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Setup environment
         uses: ./.github/actions/sample-validation-setup
@@ -662,7 +662,7 @@ jobs:
           cd scripts && uv run python -m sample_validation --subdir semantic-kernel-migration --save-report --report-name semantic-kernel-migration
 
       - name: Upload validation report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-report-semantic-kernel-migration
@@ -690,10 +690,10 @@ jobs:
       - validate-autogen-migration
       - validate-semantic-kernel-migration
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
       - name: Download all validation reports
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        uses: actions/download-artifact@v7
         with:
           pattern: validation-report-*
           path: reports/
@@ -701,7 +701,7 @@ jobs:
 
       - name: Restore validation history
         id: cache-restore
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/restore@v4
         with:
           path: validation-history/
           key: validation-history-${{ github.run_id }}
@@ -719,13 +719,13 @@ jobs:
         run: cat trend-report.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Save validation history
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/save@v4
         with:
           path: validation-history/
           key: validation-history-${{ github.run_id }}
 
       - name: Upload trend report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: validation-trend-report

.github/workflows/python-test-coverage-report.yml

@@ -8,7 +8,6 @@ on:
 
 permissions:
   contents: read
-  actions: read
   pull-requests: write
 
 jobs:
@@ -20,11 +19,11 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Download coverage report
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
+        uses: actions/download-artifact@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,17 +38,17 @@ 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"
       - name: Pytest coverage comment
         id: coverageComment
-        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4 # v1.6.0
+        uses: MishaKav/pytest-coverage-comment@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"

.github/workflows/python-test-coverage.yml

@@ -22,7 +22,7 @@ jobs:
     env:
       UV_PYTHON: "3.11"
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       # Save the PR number to a file since the workflow_run event
       # in the coverage report workflow does not have access to it
       - name: Save PR number
@@ -42,7 +42,7 @@ jobs:
       - name: Check coverage threshold
         run: python ${{ github.workspace }}/.github/workflows/python-check-coverage.py python-coverage.xml ${{ env.COVERAGE_THRESHOLD }}
       - name: Upload coverage report
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           path: |
             python/python-coverage.xml

.github/workflows/python-tests.yml

@@ -27,7 +27,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Set up python and install the project
         id: python-setup
         uses: ./.github/actions/python-setup
@@ -46,7 +46,7 @@ jobs:
       # Surface failing tests
       - name: Surface failing tests
         if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
+        uses: pmeier/pytest-results-action@v0.7.2
         with:
           path: ./python/pytest.xml
           summary: true

.github/workflows/stale-issue-pr-ping.yml

@@ -31,9 +31,9 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.13'
 

.gitignore

@@ -136,10 +136,6 @@ celerybeat.pid
 .venv
 env/
 venv/
-
-# Foundry agent CLI (contains secrets, auto-generated)
-.foundry-agent.json
-.foundry-agent-build.log
 ENV/
 env.bak/
 venv.bak/
@@ -242,10 +238,3 @@ python/dotnet-ref
 # Generated filtered solution files (created by eng/scripts/New-FilteredSolution.ps1)
 dotnet/filtered-*.slnx
 **/*.lscache
-
-# Local tool state
-.omc/
-.omx/
-
-**/issues/
-.test_*

README.md

@@ -6,12 +6,8 @@
 [![MS Learn Documentation](https://img.shields.io/badge/MS%20Learn-Documentation-blue)](https://learn.microsoft.com/en-us/agent-framework/)
 [![PyPI](https://img.shields.io/pypi/v/agent-framework)](https://pypi.org/project/agent-framework/)
 [![NuGet](https://img.shields.io/nuget/v/Microsoft.Agents.AI)](https://www.nuget.org/profiles/MicrosoftAgentFramework/)
-[![GitHub stars](https://img.shields.io/github/stars/microsoft/agent-framework?style=social)](https://github.com/microsoft/agent-framework/stargazers)
 
-
-Microsoft Agent Framework (MAF) is an open, multi-language framework for building **production-grade AI agents and multi-agent workflows** in **.NET and Python**.
-
-Microsoft Agent Framework is built for teams taking agents from prototype to production. It provides a consistent foundation for building, orchestrating, and operating agent systems across Python and .NET, while keeping architecture choices open as requirements evolve, and supports a broad ecosystem including Microsoft Foundry, Azure OpenAI, OpenAI, and the GitHub Copilot SDK, with samples and hosting patterns for both local development and cloud deployment.
+Welcome to Microsoft's comprehensive multi-language framework for building, orchestrating, and deploying AI agents with support for both .NET and Python implementations. This framework provides everything from simple chat agents to complex multi-agent workflows with graph-based orchestration.
 
 <p align="center">
   <a href="https://www.youtube.com/watch?v=AAgdMhftj8w" title="Watch the full Agent Framework introduction (30 min)">
@@ -25,54 +21,10 @@ Microsoft Agent Framework is built for teams taking agents from prototype to pro
   </a>
 </p>
 
-## Is this the right framework for you?
+## 📋 Getting Started
 
-MAF is a strong fit if you:
-- are building agents and workflows you expect to run in production,
-- need orchestration beyond a single prompt or stateless chat loop,
-- want graph-based patterns such as sequential, concurrent, handoff, and group collaboration,
-- care about durability, restartability, observability, governance, or human-in-the-loop control,
-- need provider flexibility so your architecture can evolve without major rewrites.
+### 📦 Installation
 
-## Key Features
-Explore new MAF capabilities and real implementation patterns on the [official blog](https://devblogs.microsoft.com/agent-framework/).
-
-- **Python and C#/.NET Support**: Full framework support for both Python and C#/.NET implementations with consistent APIs
-  - [Python packages](./python/packages/) | [.NET source](./dotnet/src/)
-- **Multiple Agent Provider Support**: Support for various LLM providers with more being added continuously
-  - [Python examples](./python/samples/02-agents/providers/) | [.NET examples](./dotnet/samples/02-agents/AgentProviders/)
-- **Middleware**: Flexible middleware system for request/response processing, exception handling, and custom pipelines
-  - [Python middleware](./python/samples/02-agents/middleware/) | [.NET middleware](./dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/)
-- **Orchestration Patterns & Workflows**: Build multi-agent systems with graph-based workflows supporting sequential, concurrent, handoff, and group collaboration patterns; includes checkpointing, streaming, human-in-the-loop, and time-travel
-  - [Python workflows](./python/samples/03-workflows/) | [.NET workflows](./dotnet/samples/03-workflows/)
-- **Foundry Hosted Agents (new)**: Deploy and host your agents to Foundry-hosted infrastructure with just 2 additional lines of code
-  - [Python samples](./python/samples/04-hosting/foundry-hosted-agents/) | [.NET samples](./dotnet/samples/04-hosting/FoundryHostedAgents/)
-- **Observability**: Built-in OpenTelemetry integration for distributed tracing, monitoring, and debugging
-  - [Python observability](./python/samples/02-agents/observability/) | [.NET telemetry](./dotnet/samples/02-agents/AgentOpenTelemetry/)
-- **Declarative Agents**: Define agents using YAML for faster setup and versioning
-  - [Declarative agent samples](./declarative-agents/)
-- **Agent Skills**: Build domain-specific knowledge bases from multiple sources—files, inline code, class libraries—for agents to discover and use
-  - [Skills design](./docs/decisions/0021-agent-skills-design.md)
-- **AF Labs**: Experimental packages for cutting-edge features including benchmarking, reinforcement learning, and research initiatives
-  - [Labs directory](./python/packages/lab/)
-- **DevUI**: Interactive developer UI for agent development, testing, and debugging workflows
-  - [See the DevUI in action](https://www.youtube.com/watch?v=mOAaGY4WPvc)
-
-## Table of Contents
-
-- [Getting Started](#getting-started)
-  - [Installation](#installation)
-  - [Learning Resources](#learning-resources)
-  - [Quickstart](#quickstart)
-    - [Basic Agent - Python](#basic-agent---python)
-    - [Basic Agent - .NET](#basic-agent---net)
-- [More Examples & Samples](#more-examples--samples)
-- [Community & Feedback](#community--feedback)
-- [Troubleshooting](#troubleshooting)
-- [Contributor Resources](#contributor-resources)
-
-## Getting Started
-### Installation
 Python
 
 ```bash
@@ -85,13 +37,9 @@ pip install agent-framework
 
 ```bash
 dotnet add package Microsoft.Agents.AI
-# For Foundry integration (used in the .NET quickstart below):
-dotnet add package Microsoft.Agents.AI.Foundry
-dotnet add package Azure.AI.Projects
-dotnet add package Azure.Identity
 ```
 
-### Learning Resources
+### 📚 Documentation
 
 - **[Overview](https://learn.microsoft.com/agent-framework/overview/agent-framework-overview)** - High level overview of the framework
 - **[Quick Start](https://learn.microsoft.com/agent-framework/tutorials/quick-start)** - Get started with a simple agent
@@ -100,9 +48,44 @@ dotnet add package Azure.Identity
 - **[Migration from Semantic Kernel](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-semantic-kernel)** - Guide to migrate from Semantic Kernel
 - **[Migration from AutoGen](https://learn.microsoft.com/en-us/agent-framework/migration-guide/from-autogen)** - Guide to migrate from AutoGen
 
-### Quickstart
+Still have questions? Join our [weekly office hours](./COMMUNITY.md#public-community-office-hours) or ask questions in our [Discord channel](https://discord.gg/b5zjErwbQM) to get help from the team and other users.
 
-#### Basic Agent - Python
+### ✨ **Highlights**
+
+- **Graph-based Workflows**: Connect agents and deterministic functions using data flows with streaming, checkpointing, human-in-the-loop, and time-travel capabilities
+  - [Python workflows](./python/samples/03-workflows/) | [.NET workflows](./dotnet/samples/03-workflows/)
+- **AF Labs**: Experimental packages for cutting-edge features including benchmarking, reinforcement learning, and research initiatives
+  - [Labs directory](./python/packages/lab/)
+- **DevUI**: Interactive developer UI for agent development, testing, and debugging workflows
+  - [DevUI package](./python/packages/devui/)
+
+<p align="center">
+  <a href="https://www.youtube.com/watch?v=mOAaGY4WPvc">
+    <img src="https://img.youtube.com/vi/mOAaGY4WPvc/hqdefault.jpg" alt="See the DevUI in action" width="480">
+  </a>
+</p>
+<p align="center">
+  <a href="https://www.youtube.com/watch?v=mOAaGY4WPvc">
+    See the DevUI in action (1 min)
+  </a>
+</p>
+
+- **Python and C#/.NET Support**: Full framework support for both Python and C#/.NET implementations with consistent APIs
+  - [Python packages](./python/packages/) | [.NET source](./dotnet/src/)
+- **Observability**: Built-in OpenTelemetry integration for distributed tracing, monitoring, and debugging
+  - [Python observability](./python/samples/02-agents/observability/) | [.NET telemetry](./dotnet/samples/02-agents/AgentOpenTelemetry/)
+- **Multiple Agent Provider Support**: Support for various LLM providers with more being added continuously
+  - [Python examples](./python/samples/02-agents/providers/) | [.NET examples](./dotnet/samples/02-agents/AgentProviders/)
+- **Middleware**: Flexible middleware system for request/response processing, exception handling, and custom pipelines
+  - [Python middleware](./python/samples/02-agents/middleware/) | [.NET middleware](./dotnet/samples/02-agents/Agents/Agent_Step11_Middleware/)
+
+### 💬 **We want your feedback!**
+
+- For bugs, please file a [GitHub issue](https://github.com/microsoft/agent-framework/issues).
+
+## Quickstart
+
+### Basic Agent - Python
 
 Create a simple Azure Responses Agent that writes a haiku about the Microsoft Agent Framework
 
@@ -126,7 +109,7 @@ async def main():
           # project_endpoint=os.environ["FOUNDRY_PROJECT_ENDPOINT"],
           # model=os.environ["FOUNDRY_MODEL_DEPLOYMENT_NAME"],
       ),
-      name="HaikuAgent",
+      name="HaikuBot",
       instructions="You are an upbeat assistant that writes beautifully.",
     )
 
@@ -136,24 +119,40 @@ if __name__ == "__main__":
     asyncio.run(main())
 ```
 
-#### Basic Agent - .NET
-Create a simple Agent, using Microsoft Foundry that writes a haiku about the Microsoft Agent Framework
+### Basic Agent - .NET
+Create a simple Agent, using Microsoft Foundry with token-based auth, that writes a haiku about the Microsoft Agent Framework
 
 ```c#
-// This sample shows how to create and run a basic agent with AIProjectClient.AsAIAgent(...).
-
+// dotnet add package Microsoft.Agents.AI.Foundry
+// Use `az login` to authenticate with Azure CLI
+using Azure.AI.Projects;
+using Azure.Identity;
+using System;
 using Azure.AI.Projects;
 using Azure.Identity;
-using Microsoft.Agents.AI;
 
-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";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
 
-AIAgent agent =
-    new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: deploymentName, instructions: "You are an upbeat assistant that writes beautifully.", name: "HaikuAgent");
+var agent = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
+    .AsAIAgent(model: deploymentName, name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
+
+Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Framework."));
+```
+
+Create a simple Agent, using OpenAI Responses, that writes a haiku about the Microsoft Agent Framework
+
+```c#
+// dotnet add package Microsoft.Agents.AI.OpenAI
+using System;
+using OpenAI;
+using OpenAI.Responses;
+
+// Replace the <apikey> with your OpenAI API key.
+var agent = new OpenAIClient("<apikey>")
+    .GetResponsesClient()
+    .AsAIAgent(model: "gpt-5.4-mini", name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
 
-// Once you have the agent, you can invoke it like any other AIAgent.
 Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Framework."));
 ```
 
@@ -176,12 +175,6 @@ Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Fram
 - [Hosting](./dotnet/samples/04-hosting): A2A, Durable Agents, Durable Workflows
 - [End-to-End](./dotnet/samples/05-end-to-end): full applications and demos
 
-## Community & Feedback
-
-- **Found a bug?** File a [GitHub issue](https://github.com/microsoft/agent-framework/issues) to help us improve.
-- **Enjoying MAF?** [![GitHub stars](https://img.shields.io/badge/Star-us%20on%20GitHub-yellow)](https://github.com/microsoft/agent-framework) to show your support and help others discover the project.
-- **Have questions?** Join our [Discord](https://discord.gg/b5zjErwbQM) or visit [weekly office hours](./COMMUNITY.md#public-community-office-hours).
-
 ## Troubleshooting
 
 ### Authentication
@@ -194,7 +187,16 @@ Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Fram
 > **Tip:** `DefaultAzureCredential` is convenient for development but in production, consider using a specific credential (e.g., `ManagedIdentityCredential`) to avoid latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 
 ### Environment Variables
-For environment variable configuration specific to each sample, refer to the README in the sample directory ([Python samples](./python/samples/) | [.NET samples](./dotnet/samples/)).
+
+The samples typically read configuration from environment variables. Common required variables:
+
+| Variable | Used by | Purpose |
+|----------|---------|---------|
+| `AZURE_OPENAI_ENDPOINT` | Azure OpenAI samples | Your Azure OpenAI resource URL |
+| `AZURE_OPENAI_DEPLOYMENT_NAME` | Azure OpenAI samples | Model deployment name (e.g. `gpt-4o-mini`) |
+| `AZURE_AI_PROJECT_ENDPOINT` | Microsoft Foundry samples | Your Microsoft Foundry project endpoint |
+| `AZURE_AI_MODEL_DEPLOYMENT_NAME` | Microsoft Foundry samples | Model deployment name |
+| `OPENAI_API_KEY` | OpenAI (non-Azure) samples | Your OpenAI platform API key |
 
 ## Contributor Resources
 

SUPPORT.md

@@ -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.

docs/decisions/0024-prompt-injection-defense.md

@@ -1,142 +0,0 @@
----
-status: proposed
-contact: shruti
-date: 2026-01-14
-deciders: {}
-consulted: {}
-informed: {}
----
-
-# FIDES - Deterministic Prompt Injection Defense [Costa et al., 2025]
-
-## Context and Problem Statement
-
-AI agents are vulnerable to prompt injection attacks where malicious instructions embedded in external content (e.g., API responses, user input) can manipulate agent behavior. Traditional defenses rely on heuristics and prompt engineering, which are not deterministic and can be bypassed.
-
-We need a systematic, deterministic defense mechanism that prevents untrusted content from influencing agent behavior, provides verifiable security guarantees, maintains audit trails for compliance, and integrates seamlessly with the existing agent framework.
-
-## Decision Drivers
-
-- Agents must not execute actions influenced by untrusted external content (prompt injection defense).
-- The solution must provide deterministic, verifiable security guarantees — not heuristic-based.
-- The solution must maintain audit trails for compliance and security reviews.
-- The solution must integrate non-invasively with the existing middleware pipeline.
-- The solution must be opt-in and backwards compatible with existing agents.
-- Developer experience must remain simple with a clear security model.
-
-## Considered Options
-
-- Information-flow control with label-based middleware (FIDES)
-- Prompt engineering defense
-- Content sanitization
-- Separate agent instances
-- Runtime monitoring only
-
-## Decision Outcome
-
-Chosen option: "Information-flow control with label-based middleware (FIDES)", because it is the only option that provides deterministic, formally verifiable security guarantees while integrating non-invasively with the existing middleware pipeline and remaining fully backwards compatible.
-
-FIDES (Flow Integrity Deterministic Enforcement System) is a label-based security system with four core components:
-
-1. **Content Labeling System** — `IntegrityLabel` (TRUSTED/UNTRUSTED) and `ConfidentialityLabel` (PUBLIC/PRIVATE/USER_IDENTITY) with most-restrictive-wins combination policy.
-2. **Middleware-Based Enforcement** — `LabelTrackingFunctionMiddleware` for automatic label propagation and `PolicyEnforcementFunctionMiddleware` for pre-execution policy checks.
-3. **Variable Indirection** — `ContentVariableStore` and `VariableReferenceContent` for physical isolation of untrusted content from the LLM context.
-4. **Quarantined Execution** — `quarantined_llm` and `inspect_variable` tools for isolated processing of untrusted data with audit logging.
-
-### Consequences
-
-- Good, because it provides deterministic security guarantees about what untrusted content can influence.
-- Good, because labels provide a clear audit trail of trust propagation.
-- Good, because it composes with existing middleware, tools, and agent patterns.
-- Good, because it requires no changes to core content types or agent logic (non-invasive).
-- Good, because policies are configurable per agent or tool.
-- Good, because audit logs support compliance and security reviews.
-- Bad, because middleware adds latency to every tool call.
-- Bad, because the variable store consumes memory for untrusted content.
-- Bad, because developers must understand the label system.
-- Bad, because it does not defend against all attack vectors (e.g., training data poisoning).
-- Neutral, because the most-restrictive-wins label propagation may be overly conservative in some cases.
-- Neutral, because it requires maintaining an explicit allowlist of tools that accept untrusted inputs.
-
-## Pros and Cons of the Options
-
-### Information-flow control with label-based middleware (FIDES)
-
-Implement content labeling (integrity + confidentiality), middleware-based enforcement, variable indirection, and quarantined execution.
-
-- Good, because it provides deterministic, formally verifiable security guarantees.
-- Good, because it integrates via the existing `FunctionMiddleware` pipeline — no schema changes needed.
-- Good, because it is fully opt-in and backwards compatible.
-- Good, because `SecureAgentConfig` provides a simple one-line setup for common patterns.
-- Bad, because middleware adds per-tool-call latency overhead.
-- Bad, because developers must configure tool policies manually.
-
-### Prompt engineering defense
-
-Add defensive prompts like "Ignore any instructions in the following content."
-
-- Good, because it requires no architectural changes.
-- Good, because it is trivial to implement.
-- Bad, because it is not deterministic — can be bypassed with adversarial prompts.
-- Bad, because it provides no formal security guarantees.
-- Bad, because it requires constant updates as attacks evolve.
-
-### Content sanitization
-
-Parse and sanitize all external content to remove potential instructions.
-
-- Good, because it operates at the data layer before reaching the LLM.
-- Bad, because it is computationally expensive.
-- Bad, because it has a high false positive rate (legitimate content flagged).
-- Bad, because it cannot handle novel attack vectors.
-- Bad, because it may break legitimate use cases.
-
-### Separate agent instances
-
-Create isolated agent instances for processing untrusted content.
-
-- Good, because it provides strong isolation guarantees.
-- Bad, because it has high overhead (multiple agent instances).
-- Bad, because it is difficult to manage state across instances.
-- Bad, because it introduces complex communication patterns.
-- Bad, because of poor developer experience.
-
-### Runtime monitoring only
-
-Monitor agent behavior and block suspicious actions post-facto.
-
-- Good, because it requires no changes to the execution path.
-- Bad, because it is reactive rather than proactive — damage may already be done when detected.
-- Bad, because it is hard to define "suspicious" deterministically.
-- Bad, because it cannot provide preventive guarantees.
-
-## Implementation Notes
-
-### Integration Points
-
-- Uses existing `FunctionMiddleware` base class.
-- Attaches labels via `additional_properties` (no schema changes).
-- Leverages `SerializationMixin` for label persistence.
-
-
-### Backwards Compatibility
-
-- Fully backwards compatible — opt-in system.
-- Agents without security middleware function normally.
-- Unlabeled content defaults to UNTRUSTED (safer default).
-- No breaking changes to existing APIs.
-
-## Related Decisions
-
-- [ADR-0007: Agent Filtering Middleware](0007-agent-filtering-middleware.md) — Established middleware patterns we build upon.
-- [ADR-0006: User Approval](0006-userapproval.md) — Human-in-the-loop pattern we reference.
-
-## References
-
-- [Securing AI Agents with Information-Flow Control (Costa et al., 2025)](https://arxiv.org/abs/2505.23643)
-- [Prompt Injection Attack Examples](https://simonwillison.net/2023/Apr/14/worst-that-can-happen/)
-- [Information Flow Control](https://en.wikipedia.org/wiki/Information_flow_(information_theory))
-- [Taint Analysis](https://en.wikipedia.org/wiki/Taint_checking)
-- [Defense in Depth](https://en.wikipedia.org/wiki/Defense_in_depth_(computing))
-- [ ] Performance Benchmarks
-- [ ] User Acceptance Testing

docs/decisions/0026-hosted-session-identity-context.md

@@ -1,84 +0,0 @@
----
-status: accepted
-contact: rogerbarreto
-date: 2026-05-07
-deciders: rogerbarreto
-consulted: []
-informed: []
----
-
-# Hosted session identity context for Foundry Hosting
-
-## Context and Problem Statement
-
-Server-hosted Foundry agents need a way to scope per-user state (most notably `FoundryMemoryProvider` memories) by the end user that initiated the request. The Foundry platform already injects `x-agent-user-isolation-key` and `x-agent-chat-isolation-key` headers on every Responses request, but the agent-framework hosting layer did not surface those values to `AIContextProvider` instances. The provider's `stateInitializer` only received an `AgentSession?` with no identity attached, so per-user scoping was impossible without out-of-band plumbing.
-
-## Decision Drivers
-
-- Memory and any future user-private context must be partitioned per end user without per-sample boilerplate.
-- The identity must be **read-only** from the perspective of `AIContextProvider`s, so a buggy or hostile provider cannot escalate or leak across users.
-- The persisted session must validate against the live request on every resume to defend against session-id leak and in-process tampering.
-- The change must work for every existing hosted-agent type (`ChatClientAgent`, `FoundryAgent`, future ones) without per-type refactoring of cast-heavy code paths in `Microsoft.Agents.AI`.
-- Local Docker debugging must remain possible when the platform headers are absent.
-
-## Considered Options
-
-1. **`HostedSessionContext` stored in `AgentSessionStateBag`, exposed via a public read accessor and an `internal` setter.** Hosting writes once on session creation and validates on every resume.
-2. **Specialised `HostedAgentSession : AgentSession` wrapper** that carries `UserId`/`ChatId` properties, with `GetService<ChatClientAgentSession>()` as the unwrap escape hatch.
-3. **New property on `AgentSession` base class** (`HostedSessionContext? HostedContext { get; internal set; }`).
-4. **AsyncLocal middleware** that reads the headers and stuffs them into a per-request `AsyncLocal<HostedSessionContext>` consumed by the provider.
-
-For the source of identity:
-- A. The platform-injected `IsolationContext` exposed by `ResponseContext.Isolation` (typed `UserIsolationKey`/`ChatIsolationKey`).
-- B. The OpenAI Responses spec's top-level `request.User` field.
-- C. A custom HTTP header `x-client-user`.
-
-## Decision Outcome
-
-**Option 1** was chosen for the storage shape, sourced from **Option A** (`ResponseContext.Isolation`).
-
-Rationale:
-
-- **Wrapper rejected (Option 2).** `ChatClientAgentSession` is `sealed` and `ChatClientAgent` rejects any other session type via direct `is not ChatClientAgentSession` checks at multiple call sites. Wrapping would force non-trivial refactors across `Microsoft.Agents.AI` and a corresponding repeat for every other agent type.
-- **Base-class property rejected (Option 3).** Leaks "hosted" semantics into the universal `AgentSession` abstraction used by Durable, A2A, and CopilotStudio agents that have no notion of a hosted user.
-- **AsyncLocal rejected (Option 4).** Surfaces the concept only locally, requires every consumer to re-implement the bridge, and cannot be enforced as read-only.
-- **`request.User` rejected (Option B).** Set by the caller, not the platform. Forging it client-side trivially defeats per-user partitioning.
-- **`x-client-user` rejected (Option C).** Non-standard, requires custom HTTP plumbing, and duplicates the platform-provided isolation contract.
-
-Implementation summary in `Microsoft.Agents.AI.Foundry.Hosting`:
-
-| Type | Visibility | Purpose |
-|---|---|---|
-| `HostedSessionContext` | public sealed | Captures `UserId` and `ChatId` (both required, non-whitespace). |
-| `HostedSessionContextExtensions.GetHostedContext` | public | Read accessor for `AIContextProvider`s. |
-| `HostedSessionContextExtensions.SetHostedContext` | internal | Writer reserved for the hosting assembly. Backed by `AgentSessionStateBag` under a well-known key for serialisation. |
-| `HostedSessionIsolationKeyProvider` (abstract) | public | DI-resolvable factory. Async signature: `ValueTask<HostedSessionContext?> GetKeysAsync(ResponseContext, CreateResponse, CancellationToken)`. |
-| `PlatformHostedSessionIsolationKeyProvider` | internal sealed | Default implementation. Maps `context.Isolation.UserIsolationKey` and `context.Isolation.ChatIsolationKey`. Returns `null` when either is absent. |
-
-Behaviour added to `AgentFrameworkResponseHandler.CreateAsync`:
-
-1. Resolve `HostedSessionIsolationKeyProvider` from DI; fall back to `PlatformHostedSessionIsolationKeyProvider`.
-2. Call `GetKeysAsync(context, request, cancellationToken)`. A `null` result throws `InvalidOperationException` (becomes 500). A null/whitespace `UserId` or `ChatId` is rejected by `HostedSessionContext`'s constructor.
-3. Branch on the **session's existing context**, not on whether a `conversation_id` was supplied:
-   - **No session (`session is null`):** nothing to stamp; skip.
-   - **Session present but un-stamped (`GetHostedContext() is null`):** treat as fresh. This covers both newly-created sessions and pre-existing sessions whose `conversation_id` was provisioned externally (e.g. via `conversations.CreateProjectConversationAsync()`) before the first hosted-agent request. Stamp the resolved identity now.
-   - **Session present with stamped context:** strict resume. The persisted `UserId` and `ChatId` must equal the resolved values exactly. Mismatch throws `ResponsesApiException` with status 403 and body `Hosted session identity context mismatch`.
-
-## Consequences
-
-Positive:
-
-- Per-user memory partitioning works out of the box for any agent that consumes a `Microsoft.Agents.AI.Foundry.FoundryMemoryProvider` configured to read `session.GetHostedContext().UserId`.
-- Cross-user session-id leak and in-process tampering of the persisted identity both surface as a 403 with a deliberately uninformative body.
-- The identity is opaque to the framework, matching the platform's semantics. The framework never inspects user identity; the `IsolationContext` keys are pre-partitioned per agent.
-
-Negative:
-
-- Every existing hosted sample fails locally without a `HostedSessionIsolationKeyProvider` registered, because the platform headers are absent outside the platform. Mitigated by shipping `Hosted_Shared_Contributor_Setup` with `DevTemporaryLocalSessionIsolationKeyProvider` and `AddDevTemporaryLocalContributorSetup`, and migrating all 9 existing responses samples.
-- An attacker who can plant an un-stamped session under a victim's `conversation_id` *before* the victim's first hosted-agent request would be stamped with the attacker's identity on that first request. This is not a regression vs. behaviour without this contract, and is mitigated in practice because the `conversation_id` namespace is allocated by the platform per project. Once a session is stamped, the strict equality check fully defends the resume path.
-
-## Out of scope
-
-- Per-request `User` field on `CreateResponse` is intentionally not consumed; only the platform `IsolationContext` headers carry trustworthy identity.
-- Generic (non-Foundry) hosting layers can re-define an equivalent type if needed; nothing in this ADR is moved into `Microsoft.Agents.AI.Hosting` because `Microsoft.Agents.AI.Foundry.Hosting` does not depend on it.
-- HMAC tamper signatures over the persisted context are not implemented; comparison against `ResponseContext.Isolation` on every request is sufficient because the platform sets those headers at the trust boundary.

docs/features/FIDES_IMPLEMENTATION_SUMMARY.md

@@ -1,352 +0,0 @@
-# FIDES Implementation Summary
-
-## Overview
-
-**FIDES**  is a comprehensive deterministic prompt injection defense system for the agent framework. The implementation provides label-based security mechanisms to defend against prompt injection attacks by tracking integrity and confidentiality of content throughout agent execution.
-
-**🚀 Key Features:**
-- **Context Provider Pattern** - `SecureAgentConfig` extends `ContextProvider`, injecting tools, instructions, and middleware automatically
-- **Automatic Variable Hiding** - UNTRUSTED content is automatically hidden without requiring manual intervention
-- **Per-Item Embedded Labels** - Tools return `list[Content]` with `Content.from_text()` for proper label propagation
-- **SecureAgentConfig** - One-line secure agent configuration via `context_providers=[config]`
-- **Data Exfiltration Prevention** - `max_allowed_confidentiality` prevents sensitive data leakage
-- **Message-Level Label Tracking** (Phase 1) - Track labels on every message in the conversation
-
-## Architecture Components
-
-The FIDES defense system consists of seven main components:
-
-1. **Content Labeling Infrastructure** - Labels for tracking integrity and confidentiality
-2. **Label Tracking Middleware** - Automatically assigns, propagates labels, and hides untrusted content
-3. **Per-Item Embedded Labels** - Tools can return mixed-trust data with per-item security labels
-4. **Policy Enforcement Middleware** - Blocks tool calls that violate security policies
-5. **Security Tools** - Specialized tools for safe handling of untrusted content (`quarantined_llm`, `inspect_variable`)
-6. **SecureAgentConfig** - Context provider for easy secure agent configuration
-7. **Message-Level Label Tracking** - Track labels on every message in the conversation (Phase 1)
-
-## Implementation Details
-
-### Files Created
-
-1. **`python/packages/core/agent_framework/security.py`** (~2950 lines — all security primitives, middleware, tools, and configuration in a single public module)
-   - `IntegrityLabel` enum (TRUSTED/UNTRUSTED)
-   - `ConfidentialityLabel` enum (PUBLIC/PRIVATE/USER_IDENTITY)
-   - `ContentLabel` class with serialization support
-   - `combine_labels()` function for label composition
-   - `ContentVariableStore` for client-side content storage
-   - `VariableReferenceContent` for variable indirection
-   - `LabeledMessage` class (inherits from `Message`) for message-level tracking
-   - `check_confidentiality_allowed()` helper for data exfiltration prevention
-   - `LabelTrackingFunctionMiddleware` - Tracks and propagates security labels
-   - `PolicyEnforcementFunctionMiddleware` - Enforces security policies
-   - `SecureAgentConfig` extends `ContextProvider` - automatic secure agent configuration
-   - `quarantined_llm()` - Isolated LLM calls with labeled data
-   - `inspect_variable()` - Controlled variable content inspection
-   - `store_untrusted_content()` - Helper for manual variable indirection (legacy)
-   - `get_security_tools()` - Returns list of security tools
-   - `SECURITY_TOOL_INSTRUCTIONS` - Detailed guidance for agents
-
-
-2. **`FIDES_DEVELOPER_GUIDE.md`** (~1250 lines)
-   - Located at `python/samples/02-agents/security/FIDES_DEVELOPER_GUIDE.md`
-   - Complete documentation of the FIDES security system
-   - Architecture overview and design rationale
-   - Usage examples (6+ comprehensive scenarios)
-   - Best practices and configuration options
-   - API reference with full parameter documentation
-   - Data exfiltration prevention documentation
-
-3. **`python/packages/core/tests/test_security.py`** (~800+ lines)
-   - Unit tests for ContentLabel and label operations
-   - Tests for ContentVariableStore functionality
-   - Tests for VariableReferenceContent
-   - Middleware behavior tests (label tracking and policy enforcement)
-   - Automatic hiding tests
-   - Per-item embedded label tests
-   - Context label tracking tests
-   - Message-level tracking tests (Phase 1)
-   - Data exfiltration prevention tests
-
-4. **`docs/decisions/0024-prompt-injection-defense.md`**
-   - Architecture Decision Record (ADR)
-   - Design rationale and alternatives considered
-   - Security properties and guarantees
-
-5. **`python/samples/02-agents/security/README.md`**
-   - Sample-focused entry point for the two runnable FIDES security samples
-   - Prerequisites, run commands, and links to the developer guide for deeper details
-
-### Files Modified
-
-1. **`python/packages/core/agent_framework/__init__.py`**
-   - Removed root-level security exports so `agent_framework.security` is the canonical import surface
-
-## Core Features
-
-### 1. Content Labeling Infrastructure
-
-- **IntegrityLabel**: TRUSTED (user input) vs UNTRUSTED (AI-generated, external)
-- **ConfidentialityLabel**: PUBLIC, PRIVATE, USER_IDENTITY
-- **Label Combination**: Most restrictive policy (UNTRUSTED + metadata merging)
-- **Serialization**: Full support for `to_dict()` and `from_dict()`
-
-### 2. Per-Item Embedded Labels
-
-Tools returning mixed-trust data embed labels on individual items using `Content.from_text()`:
-
-```python
-import json
-from agent_framework import Content, tool
-
-@tool(description="Fetch emails from inbox")
-async def fetch_emails(count: int = 5) -> list[Content]:
-    return [
-        Content.from_text(
-            json.dumps({
-                "id": email["id"],
-                "body": email["body"],
-            }),
-            additional_properties={
-                "security_label": {
-                    "integrity": "trusted" if email["internal"] else "untrusted",
-                    "confidentiality": "private",
-                }
-            ),
-        )
-        for email in emails
-    ]
-```
-
-These embedded labels are automatically consumed by `LabelTrackingFunctionMiddleware`, which:
-- Extracts the `security_label` from `additional_properties`
-- Uses the embedded label as the highest-priority source for that item
-- Automatically hides UNTRUSTED items in the variable store
-- Replaces hidden items with `VariableReferenceContent` in the LLM context
-- Preserves TRUSTED items visible to the LLM without tainting the context label
-
-This enables tools to return mixed-trust data where some items (internal emails) remain visible while untrusted items (external emails) are automatically hidden without manual intervention.
-           },
-        )
-        for email in emails
-    ]
-```
-
-### 3. Automatic Variable Hiding
-
-This feature automatically hides any UNTRUSTED content returned by tools while keeping the hiding logic transparent to the developer. Developers do not need to manually call `store_untrusted_content()`. This allows the LLM /agent's context to remain clean and secure. Key aspects include:
-
-- **Automatic Detection**: Middleware checks integrity label after each tool call
-- **Automatic Storage**: UNTRUSTED results/items stored in variable store
-- **Transparent Replacement**: LLM context receives `VariableReferenceContent`
-- **Context Label Protection**: Hidden content does NOT taint context label
-
-### 4. Context Label Tracking
-
-- Context label starts as TRUSTED + PUBLIC
-- Gets updated (tainted) when non-hidden untrusted content enters context
-- Policy enforcement uses context label for validation
-- Provides `get_context_label()` and `reset_context_label()` methods
-
-### 5. Data Exfiltration Prevention
-
-Tools declare `max_allowed_confidentiality` to prevent sensitive data leakage:
-
-```python
-@tool(
-    description="Post to public Slack channel",
-    additional_properties={
-        "max_allowed_confidentiality": "public",  # Blocks PRIVATE data
-    }
-)
-async def post_to_slack(channel: str, message: str) -> dict:
-    return {"status": "posted"}
-```
-
-### 6. SecureAgentConfig (Context Provider)
-
-SecureAgentConfig extends `ContextProvider` for automatic secure agent configuration:
-
-```python
-config = SecureAgentConfig(
-    auto_hide_untrusted=True,
-    allow_untrusted_tools={"search_web", "fetch_data"},
-    block_on_violation=True,
-    quarantine_chat_client=quarantine_client,  # Optional: real LLM for quarantine
-)
-
-# Context provider injects tools, instructions, and middleware automatically
-agent = Agent(
-    client=client,
-    name="secure_assistant",
-    instructions="You are a helpful assistant.",
-    tools=[my_tool],
-    context_providers=[config],  # That's it!
-)
-```
-
-## Security Properties
-
-### Deterministic Defense
-
-1. **Tiered label propagation**: Every tool result receives a label via 3-tier priority (embedded > source_integrity > input labels join)
-2. **Context tracking**: Cumulative security state tracked across turns
-3. **Policy enforcement**: Violations blocked before execution
-4. **Content isolation**: Untrusted content stored as variables
-5. **Taint propagation**: Once context becomes UNTRUSTED, it stays UNTRUSTED
-6. **Data exfiltration prevention**: `max_allowed_confidentiality` gates output destinations
-7. **Audit trail**: All security events logged
-8. **No runtime guessing**: Deterministic label assignment
-
-### Attack Prevention
-
-- **Direct prompt injection**: Variables hide actual content from LLM
-- **Indirect prompt injection**: Labels track untrusted AI-generated calls
-- **Privilege escalation**: Policy blocks untrusted calls to privileged tools
-- **Data exfiltration**: Confidentiality labels + `max_allowed_confidentiality` enforced
-- **Tool misuse**: Only whitelisted tools accept untrusted inputs
-
-## Configuration Options
-
-### LabelTrackingFunctionMiddleware
-- `default_integrity`: Default label for unknown sources
-- `default_confidentiality`: Default confidentiality level
-- `auto_hide_untrusted`: Enable automatic variable hiding (default: True)
-- `hide_threshold`: Integrity level at which hiding occurs (default: UNTRUSTED)
-
-### PolicyEnforcementFunctionMiddleware
-- `allow_untrusted_tools`: Set of tools accepting untrusted inputs
-- `block_on_violation`: Block vs warn on violations
-- `enable_audit_log`: Enable/disable audit logging
-
-### Tool Metadata (via `additional_properties`)
-- `confidentiality`: Tool's output confidentiality level
-- `source_integrity`: Fallback integrity for unlabeled results (data-producing tools only)
-- `accepts_untrusted`: Explicit untrusted input permission
-- `max_allowed_confidentiality`: Maximum allowed input confidentiality (for sink tools)
-- `requires_approval`: Human-in-the-loop requirement
-
-## Usage Pattern
-
-### Recommended: SecureAgentConfig as Context Provider
-
-```python
-from agent_framework.security import SecureAgentConfig
-
-config = SecureAgentConfig(
-    auto_hide_untrusted=True,
-    allow_untrusted_tools={"search_web"},
-    block_on_violation=True,
-)
-
-# Context provider injects everything automatically
-agent = Agent(
-    client=client,
-    name="secure_assistant",
-    instructions="You are a helpful assistant.",
-    tools=[search_web],
-    context_providers=[config],  # Tools, instructions, and middleware injected via before_run()
-)
-```
-
-### Processing Hidden Content with quarantined_llm
-
-```python
-from agent_framework.security import quarantined_llm
-
-# Agent automatically uses quarantined_llm with variable_ids
-result = await quarantined_llm(
-    prompt="Summarize this data",
-    variable_ids=["var_abc123"]  # Reference hidden content by ID
-)
-```
-
-## Testing
-
-Comprehensive test suite with:
-- 115+ unit tests covering all components
-- Label creation, serialization, combination
-- Variable store operations
-- Middleware behavior (tracking and enforcement)
-- Automatic hiding with per-item labels
-- Context label tracking
-- Message-level tracking (Phase 1)
-- Data exfiltration prevention
-- Policy violation scenarios
-- Audit log verification
-
-Run tests:
-```bash
-cd python/packages/core && ../../.venv/bin/pytest tests/test_security.py -v
-```
-
-## Code Statistics
-
-- **Total lines**: ~2,950+ lines (single `security.py` module)
-- **New modules**: 1 (`security.py` — consolidated from 3 original modules)
-- **Total tests**: 115+ unit tests
-- **Documentation**: 1,250+ lines in developer guide
-- **Examples**: 6+ comprehensive scenarios
-
-## Deliverables Checklist
-
-### Core Implementation
-✅ ContentLabel infrastructure with integrity and confidentiality
-✅ ContentVariableStore for variable indirection
-✅ VariableReferenceContent for safe context references
-✅ LabelTrackingFunctionMiddleware for automatic labeling
-✅ PolicyEnforcementFunctionMiddleware for policy enforcement
-✅ quarantined_llm tool for isolated processing
-✅ inspect_variable tool for controlled content access
-✅ store_untrusted_content helper for manual variable indirection
-
-### Automatic Hiding Enhancement
-✅ Auto-hide UNTRUSTED content with `auto_hide_untrusted` flag
-✅ Per-middleware ContentVariableStore instances
-✅ Thread-local storage for middleware access from tools
-✅ Automatic UNTRUSTED content replacement
-
-### Per-Item Embedded Labels
-✅ Support for `additional_properties.security_label` on individual items
-✅ Mixed-trust data handling (hide untrusted, keep trusted visible)
-✅ Fallback to `source_integrity` for unlabeled items
-
-### Context Label Tracking
-✅ Cumulative context label tracking across turns
-✅ Hidden content does NOT taint context
-✅ `get_context_label()` and `reset_context_label()` methods
-✅ Policy enforcement uses context label
-
-### Data Exfiltration Prevention
-✅ `max_allowed_confidentiality` tool property
-✅ `check_confidentiality_allowed()` helper function
-✅ Policy enforcement validates confidentiality flow
-
-### SecureAgentConfig
-✅ Context provider pattern with `ContextProvider` base class
-✅ `before_run()` hook for automatic injection of tools, instructions, and middleware
-✅ One-line secure agent configuration via `context_providers=[config]`
-✅ `get_tools()`, `get_instructions()`, `get_middleware()` methods (for manual use)
-✅ `quarantine_chat_client` support for real LLM calls
-✅ `SECURITY_TOOL_INSTRUCTIONS` constant
-
-### Documentation & Testing
-✅ Complete FIDES Developer Guide (~1250 lines)
-✅ Architecture Decision Record (ADR)
-✅ Quick Start Guide
-✅ Comprehensive test suite (115+ tests)
-✅ Example code with 6+ scenarios
-✅ 3 complete security examples (email, repo confidentiality, GitHub MCP labels)
-
-## Summary
-
-**FIDES** provides a comprehensive, deterministic defense against prompt injection attacks with:
-
-- **Zero-effort protection**: Automatic variable hiding for developers
-- **Context provider pattern**: `SecureAgentConfig` extends `ContextProvider` for automatic setup
-- **Granular control**: Per-item embedded labels via `Content.from_text()` for mixed-trust data
-- **Easy configuration**: `SecureAgentConfig` for one-line setup
-- **Data safety**: Exfiltration prevention via confidentiality gates
-- **Full traceability**: Message-level label tracking
-- **Complete auditability**: All security events logged
-
-The system ensures that untrusted content never directly reaches the LLM context and that all tool calls are policy-checked based on the cumulative security state before execution.

dotnet/.github/skills/verify-samples-tool/SKILL.md

@@ -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."],
 },
 ```
 

dotnet/.gitignore

@@ -402,11 +402,4 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
-
-# Foundry agent CLI config (contains secrets, auto-generated)
-.foundry-agent.json
-.foundry-agent-build.log
-
-# Pre-published output for Docker builds
-out/
+*.sln.iml

dotnet/Directory.Packages.props

@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->
-    <PackageVersion Include="Anthropic" Version="12.20.0" />
+    <PackageVersion Include="Anthropic" Version="12.13.0" />
     <PackageVersion Include="Anthropic.Foundry" Version="0.5.0" />
     <PackageVersion Include="Aspire.Hosting" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="13.0.0-preview.1.25560.3" />
@@ -22,17 +22,11 @@
     <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.Search.Documents" Version="12.0.0" />
-    <PackageVersion Include="Azure.AI.Projects" Version="2.1.0-beta.2" />
+    <PackageVersion Include="Azure.AI.Projects" Version="2.0.0" />
     <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.Identity" Version="1.21.0" />
-    <PackageVersion Include="DotNetEnv" Version="3.1.1" />
-    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.20.0" />
+    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
     <!-- Google Gemini  -->
     <PackageVersion Include="Google.GenAI" Version="1.6.0" />
     <PackageVersion Include="Mscc.GenerativeAI.Microsoft" Version="2.9.3" />
@@ -43,41 +37,41 @@
     <!-- System.* -->
     <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="Microsoft.Bcl.Memory" Version="10.0.4" />
+    <PackageVersion Include="System.ClientModel" Version="1.10.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" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.6" />
-    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.5" />
+    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.4" />
     <PackageVersion Include="System.Net.Http.Json" Version="10.0.0" />
-    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.5" />
+    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.4" />
     <PackageVersion Include="System.Text.Json" Version="10.0.6" />
     <PackageVersion Include="System.Threading.Channels" Version="10.0.6" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
     <PackageVersion Include="System.Net.Security" Version="4.3.2" />
     <!-- OpenTelemetry -->
-    <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
+    <PackageVersion Include="OpenTelemetry" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Api" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
     <!-- Microsoft.AspNetCore.* -->
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.0" />
     <!-- Microsoft.Extensions.* -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.Evaluation" Version="10.4.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.4.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="10.3.0-preview.1.26109.11" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.5.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.5.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Compliance.Abstractions" Version="10.5.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
@@ -87,7 +81,6 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
@@ -99,20 +92,17 @@
     <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-beta.2" />
+    <PackageVersion Include="GitHub.Copilot.SDK" Version="0.1.29" />
     <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
     <!-- M365 Agents SDK -->
     <PackageVersion Include="AdaptiveCards" Version="3.1.0" />
     <PackageVersion Include="Microsoft.Agents.Authentication.Msal" Version="1.3.171-beta" />
     <PackageVersion Include="Microsoft.Agents.Hosting.AspNetCore" Version="1.3.171-beta" />
     <!-- A2A -->
-    <PackageVersion Include="A2A" Version="1.0.0-preview2" />
-    <PackageVersion Include="A2A.AspNetCore" Version="1.0.0-preview2" />
+    <PackageVersion Include="A2A" Version="0.3.4-preview" />
+    <PackageVersion Include="A2A.AspNetCore" Version="0.3.4-preview" />
     <!-- MCP -->
-    <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
-    <!-- Hyperlight -->
-    <PackageVersion Include="Hyperlight.HyperlightSandbox.Api" Version="0.4.0" />
-    <PackageVersion Include="Hyperlight.HyperlightSandbox.Guest.Python" Version="0.4.0" />
+    <PackageVersion Include="ModelContextProtocol" Version="1.1.0" />
     <!-- Inference SDKs -->
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
@@ -140,8 +130,6 @@
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
     <!-- Redis -->
     <PackageVersion Include="StackExchange.Redis" Version="2.10.1" />
-    <!-- Console UX -->
-    <PackageVersion Include="Spectre.Console" Version="0.49.1" />
     <!-- Test -->
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.22" />

dotnet/README.md

@@ -33,4 +33,3 @@ Console.WriteLine(await agent.RunAsync("Write a haiku about Microsoft Agent Fram
 - [Design Documents](../docs/design)
 - [Architectural Decision Records](../docs/decisions)
 - [MSFT Learn Docs](https://learn.microsoft.com/agent-framework/overview/agent-framework-overview)
-

dotnet/agent-framework-dotnet.slnx

@@ -1,9 +1,12 @@
-<Solution>
+<Solution>
   <Configurations>
     <BuildType Name="Debug" />
     <BuildType Name="Publish" />
     <BuildType Name="Release" />
   </Configurations>
+  <Folder Name="/src/Aspire.Hosting.AgentFramework.DevUI/">
+    <Project Path="src/Aspire.Hosting.AgentFramework.DevUI/Aspire.Hosting.AgentFramework.DevUI.csproj" />
+  </Folder>
   <Folder Name="/Samples/">
     <File Path="samples/AGENTS.md" />
     <File Path="samples/README.md" />
@@ -64,8 +67,6 @@
     <Project Path="samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Agent_Step17_AdditionalAIContext.csproj" />
     <Project Path="samples/02-agents/Agents/Agent_Step18_CompactionPipeline/Agent_Step18_CompactionPipeline.csproj" />
     <Project Path="samples/02-agents/Agents/Agent_Step19_InFunctionLoopCheckpointing/Agent_Step19_InFunctionLoopCheckpointing.csproj" />
-    <Project Path="samples/02-agents/Agents/Agent_Step20_DynamicFunctionTools/Agent_Step20_DynamicFunctionTools.csproj" />
-    <Project Path="samples/02-agents/Agents/Agent_Step21_ShellWithEnvironment/Agent_Step21_ShellWithEnvironment.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/DeclarativeAgents/">
     <Project Path="samples/02-agents/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj" />
@@ -117,18 +118,6 @@
     <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" />
   </Folder>
   <Folder Name="/Samples/02-agents/AGUI/Step05_StateManagement/">
     <Project Path="samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj" />
@@ -173,20 +162,12 @@
     <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step22_MemorySearch/Agent_Step22_MemorySearch.csproj" />
     <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_SimpleEval/Evaluation_SimpleEval.csproj" />
     <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
     <Project Path="samples/02-agents/Evaluation/Evaluation_ExpectedOutputs/Evaluation_ExpectedOutputs.csproj" />
     <Project Path="samples/02-agents/Evaluation/Evaluation_Multimodal/Evaluation_Multimodal.csproj" />
-    <Project Path="samples/02-agents/Evaluation/Evaluation_SimpleEval/Evaluation_SimpleEval.csproj" />
-  </Folder>
-  <Folder Name="/Samples/02-agents/AgentWithCodeAct/">
-    <File Path="samples/02-agents/AgentWithCodeAct/README.md" />
-    <Project Path="samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step01_Interpreter/AgentWithCodeAct_Step01_Interpreter.csproj" />
-    <Project Path="samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step02_ToolEnabled/AgentWithCodeAct_Step02_ToolEnabled.csproj" />
-    <Project Path="samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step03_ManualWiring/AgentWithCodeAct_Step03_ManualWiring.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/AgentWithMemory/">
     <File Path="samples/02-agents/AgentWithMemory/README.md" />
@@ -214,7 +195,6 @@
   </Folder>
   <Folder Name="/Samples/02-agents/ModelContextProtocol/">
     <File Path="samples/02-agents/ModelContextProtocol/README.md" />
-    <Project Path="samples/02-agents/ModelContextProtocol/Agent_MCP_LongRunningTask_Client/Agent_MCP_LongRunningTask_Client.csproj" />
     <Project Path="samples/02-agents/ModelContextProtocol/Agent_MCP_Server/Agent_MCP_Server.csproj" />
     <Project Path="samples/02-agents/ModelContextProtocol/Agent_MCP_Server_Auth/Agent_MCP_Server_Auth.csproj" />
     <Project Path="samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP/FoundryAgent_Hosted_MCP.csproj" />
@@ -243,11 +223,10 @@
     <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/InvokeHttpRequest/InvokeHttpRequest.csproj" />
     <Project Path="samples/03-workflows/Declarative/InvokeMcpTool/InvokeMcpTool.csproj" />
     <Project Path="samples/03-workflows/Declarative/Marketing/Marketing.csproj" />
     <Project Path="samples/03-workflows/Declarative/StudentTeacher/StudentTeacher.csproj" />
@@ -283,7 +262,6 @@
   </Folder>
   <Folder Name="/Samples/03-workflows/Orchestration/">
     <Project Path="samples/03-workflows/Orchestration/Handoff/Handoff.csproj" />
-    <Project Path="samples/03-workflows/Orchestration/Magentic/Magentic.csproj" />
   </Folder>
   <Folder Name="/Samples/03-workflows/Observability/">
     <Project Path="samples/03-workflows/Observability/ApplicationInsights/ApplicationInsights.csproj" />
@@ -304,68 +282,8 @@
   </Folder>
   <Folder Name="/Samples/03-workflows/Evaluation/">
     <Project Path="samples/03-workflows/Evaluation/Evaluation_WorkflowEval/Evaluation_WorkflowEval.csproj" />
-    <Project Path="samples/03-workflows/Evaluation/Evaluation_WorkflowExpectedOutputs/Evaluation_WorkflowExpectedOutputs.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/">
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/" />
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/invocations/" />
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/invocations/Hosted-Invocations-EchoAgent/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/invocations/Hosted-Invocations-EchoAgent/Hosted-Invocations-EchoAgent.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/invocations/Using-Samples/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/invocations/Using-Samples/SimpleInvocationsAgent/SimpleInvocationsAgent.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/" />
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-ChatClientAgent/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-ChatClientAgent/HostedChatClientAgent.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-FoundryAgent/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-FoundryAgent/HostedFoundryAgent.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Files/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Files/HostedFiles.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-LocalTools/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-LocalTools/HostedLocalTools.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-McpTools/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-McpTools/HostedMcpTools.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-MemoryAgent/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-MemoryAgent/HostedMemoryAgent.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Observability/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Observability/HostedObservability.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted_Shared_Contributor_Setup/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted_Shared_Contributor_Setup/Hosted_Shared_Contributor_Setup.csproj" />
-  </Folder>
-  <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>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-TextRag/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-TextRag/HostedTextRag.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/HostedWorkflowSimple.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/SessionFilesClient/SessionFilesClient.csproj" />
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/SimpleAgent/SimpleAgent.csproj" />
-  </Folder>
-  <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/" />
   <Folder Name="/Samples/04-hosting/DurableAgents/" />
   <Folder Name="/Samples/04-hosting/DurableAgents/AzureFunctions/">
     <File Path="samples/04-hosting/DurableAgents/AzureFunctions/.editorconfig" />
@@ -389,21 +307,19 @@
     <Project Path="samples/04-hosting/DurableAgents/ConsoleApps/06_LongRunningTools/06_LongRunningTools.csproj" />
     <Project Path="samples/04-hosting/DurableAgents/ConsoleApps/07_ReliableStreaming/07_ReliableStreaming.csproj" />
   </Folder>
-  <Folder Name="/Samples/02-agents/A2A/">
-    <File Path="samples/02-agents/A2A/README.md" />
-    <Project Path="samples/02-agents/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj" />
-    <Project Path="samples/02-agents/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj" />
-    <Project Path="samples/02-agents/A2A/A2AAgent_ProtocolSelection/A2AAgent_ProtocolSelection.csproj" />
-    <Project Path="samples/02-agents/A2A/A2AAgent_StreamReconnection/A2AAgent_StreamReconnection.csproj" />
+  <Folder Name="/Samples/04-hosting/A2A/">
+    <File Path="samples/04-hosting/A2A/README.md" />
+    <Project Path="samples/04-hosting/A2A/A2AAgent_AsFunctionTools/A2AAgent_AsFunctionTools.csproj" />
+    <Project Path="samples/04-hosting/A2A/A2AAgent_PollingForTaskCompletion/A2AAgent_PollingForTaskCompletion.csproj" />
   </Folder>
   <Folder Name="/Samples/05-end-to-end/">
     <Project Path="samples/05-end-to-end/AgentWithPurview/AgentWithPurview.csproj" />
     <Project Path="samples/05-end-to-end/M365Agent/M365Agent.csproj" />
   </Folder>
   <Folder Name="/Samples/05-end-to-end/Evaluation/">
-    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_ConversationSplits/Evaluation_ConversationSplits.csproj" />
     <Project Path="samples/05-end-to-end/Evaluation/Evaluation_FoundryQuality/Evaluation_FoundryQuality.csproj" />
     <Project Path="samples/05-end-to-end/Evaluation/Evaluation_MixedProviders/Evaluation_MixedProviders.csproj" />
+    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_ConversationSplits/Evaluation_ConversationSplits.csproj" />
   </Folder>
   <Folder Name="/Samples/05-end-to-end/A2AClientServer/">
     <File Path="samples/05-end-to-end/A2AClientServer/README.md" />
@@ -422,6 +338,15 @@
     <Project Path="samples/05-end-to-end/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj" />
     <Project Path="samples/05-end-to-end/AGUIClientServer/AGUIServer/AGUIServer.csproj" />
   </Folder>
+  <Folder Name="/Samples/05-end-to-end/HostedAgents/">
+    <Project Path="samples/05-end-to-end/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/AgentThreadAndHITL/AgentThreadAndHITL.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/AgentWithHostedMCP/AgentWithHostedMCP.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/AgentWithLocalTools/AgentWithLocalTools.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/FoundryMultiAgent/FoundryMultiAgent.csproj" />
+    <Project Path="samples/05-end-to-end/HostedAgents/FoundrySingleAgent/FoundrySingleAgent.csproj" />
+  </Folder>
   <Folder Name="/Samples/05-end-to-end/AspNetAgentAuthorization/">
     <File Path="samples/05-end-to-end/AspNetAgentAuthorization/docker-compose.yml" />
     <File Path="samples/05-end-to-end/AspNetAgentAuthorization/README.md" />
@@ -573,49 +498,33 @@
   <Folder Name="/Solution Items/src/Shared/StructuredOutput/">
     <File Path="src/Shared/StructuredOutput/StructuredOutputSchemaUtilities.cs" />
   </Folder>
-  <Folder Name="/Solution Items/src/Shared/Workflows/" />
-  <Folder Name="/Solution Items/src/Shared/Workflows/Execution/">
-    <File Path="src/Shared/Workflows/Execution/README.md" />
-    <File Path="src/Shared/Workflows/Execution/WorkflowFactory.cs" />
-    <File Path="src/Shared/Workflows/Execution/WorkflowRunner.cs" />
-  </Folder>
-  <Folder Name="/Solution Items/src/Shared/Workflows/Settings/">
-    <File Path="src/Shared/Workflows/Settings/Application.cs" />
-    <File Path="src/Shared/Workflows/Settings/README.md" />
-  </Folder>
   <Folder Name="/Solution Items/tests/">
     <File Path="tests/.editorconfig" />
     <File Path="tests/Directory.Build.props" />
   </Folder>
   <Folder Name="/src/">
-    <Project Path="src/Aspire.Hosting.AgentFramework.DevUI/Aspire.Hosting.AgentFramework.DevUI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj" />
     <Project Path="src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Anthropic/Microsoft.Agents.AI.Anthropic.csproj" />
     <Project Path="src/Microsoft.Agents.AI.AzureAI.Persistent/Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
+    <Project Path="src/Microsoft.Agents.AI.Foundry/Microsoft.Agents.AI.Foundry.csproj" />
     <Project Path="src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj" />
     <Project Path="src/Microsoft.Agents.AI.CosmosNoSql/Microsoft.Agents.AI.CosmosNoSql.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Declarative/Microsoft.Agents.AI.Declarative.csproj" />
     <Project Path="src/Microsoft.Agents.AI.DevUI/Microsoft.Agents.AI.DevUI.csproj" />
     <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.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" />
     <Project Path="src/Microsoft.Agents.AI.Mem0/Microsoft.Agents.AI.Mem0.csproj" />
     <Project Path="src/Microsoft.Agents.AI.OpenAI/Microsoft.Agents.AI.OpenAI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Purview/Microsoft.Agents.AI.Purview.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Tools.Shell/Microsoft.Agents.AI.Tools.Shell.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative.Foundry/Microsoft.Agents.AI.Workflows.Declarative.Foundry.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative.Mcp/Microsoft.Agents.AI.Workflows.Declarative.Mcp.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Workflows.Declarative/Microsoft.Agents.AI.Workflows.Declarative.csproj" />
@@ -627,18 +536,15 @@
   <Folder Name="/Tests/IntegrationTests/">
     <Project Path="tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj" />
     <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
+    <Project Path="tests/Foundry.IntegrationTests/Foundry.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.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" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hyperlight.IntegrationTests/Microsoft.Agents.AI.Hyperlight.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.IntegrationTests/Microsoft.Agents.AI.Mem0.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Tools.Shell.IntegrationTests/Microsoft.Agents.AI.Tools.Shell.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.csproj" />
     <Project Path="tests/OpenAIAssistant.IntegrationTests/OpenAIAssistant.IntegrationTests.csproj" />
     <Project Path="tests/OpenAIChatCompletion.IntegrationTests/OpenAIChatCompletion.IntegrationTests.csproj" />
@@ -651,25 +557,21 @@
     <Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Anthropic.UnitTests/Microsoft.Agents.AI.Anthropic.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Foundry.UnitTests/Microsoft.Agents.AI.Foundry.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.CosmosNoSql.UnitTests/Microsoft.Agents.AI.CosmosNoSql.UnitTests.csproj" />
     <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.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" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests/Microsoft.Agents.AI.Hosting.AzureFunctions.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hyperlight.UnitTests/Microsoft.Agents.AI.Hyperlight.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Mcp.UnitTests/Microsoft.Agents.AI.Mcp.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.UnitTests/Microsoft.Agents.AI.Mem0.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.OpenAI.UnitTests/Microsoft.Agents.AI.OpenAI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Purview.UnitTests/Microsoft.Agents.AI.Purview.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Tools.Shell.UnitTests/Microsoft.Agents.AI.Tools.Shell.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.UnitTests/Microsoft.Agents.AI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.Mcp.UnitTests/Microsoft.Agents.AI.Workflows.Declarative.Mcp.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests/Microsoft.Agents.AI.Workflows.Declarative.UnitTests.csproj" />

dotnet/agent-framework-release.slnf

@@ -7,10 +7,8 @@
       "src\\Microsoft.Agents.AI.AGUI\\Microsoft.Agents.AI.AGUI.csproj",
       "src\\Microsoft.Agents.AI.Anthropic\\Microsoft.Agents.AI.Anthropic.csproj",
       "src\\Microsoft.Agents.AI.GitHub.Copilot\\Microsoft.Agents.AI.GitHub.Copilot.csproj",
-      "src\\Microsoft.Agents.AI.Harness\\Microsoft.Agents.AI.Harness.csproj",
       "src\\Microsoft.Agents.AI.AzureAI.Persistent\\Microsoft.Agents.AI.AzureAI.Persistent.csproj",
       "src\\Microsoft.Agents.AI.Foundry\\Microsoft.Agents.AI.Foundry.csproj",
-      "src\\Microsoft.Agents.AI.Foundry.Hosting\\Microsoft.Agents.AI.Foundry.Hosting.csproj",
       "src\\Microsoft.Agents.AI.CopilotStudio\\Microsoft.Agents.AI.CopilotStudio.csproj",
       "src\\Microsoft.Agents.AI.CosmosNoSql\\Microsoft.Agents.AI.CosmosNoSql.csproj",
       "src\\Microsoft.Agents.AI.Declarative\\Microsoft.Agents.AI.Declarative.csproj",
@@ -20,23 +18,18 @@
       "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",
       "src\\Microsoft.Agents.AI\\Microsoft.Agents.AI.csproj",
-      "src\\Aspire.Hosting.AgentFramework.DevUI\\Aspire.Hosting.AgentFramework.DevUI.csproj",
-      "src\\Microsoft.Agents.AI.Hyperlight\\Microsoft.Agents.AI.Hyperlight.csproj"
+      "src\\Aspire.Hosting.AgentFramework.DevUI\\Aspire.Hosting.AgentFramework.DevUI.csproj"
     ]
   }
 }

dotnet/eng/MSBuild/Shared.props

@@ -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>

dotnet/eng/scripts/New-FilteredSolution.ps1

@@ -21,15 +21,10 @@
 .PARAMETER Configuration
     Optional MSBuild configuration used when querying TargetFrameworks. Defaults to Debug.
 
-.PARAMETER TestProjectNameIncludeFilter
+.PARAMETER TestProjectNameFilter
     Optional wildcard pattern to filter test project names (e.g., *UnitTests*, *IntegrationTests*).
     When specified, only test projects whose filename matches this pattern are kept.
 
-.PARAMETER TestProjectNameExcludeFilter
-    Optional wildcard pattern(s) to exclude test projects by name (e.g., *DurableTask.IntegrationTests*).
-    When specified, test projects whose filename matches any of these patterns are removed.
-    Applied after TestProjectNameIncludeFilter. Can be a single string or an array of strings.
-
 .PARAMETER ExcludeSamples
     When specified, removes all projects under the samples/ directory from the solution.
 
@@ -43,15 +38,11 @@
 
 .EXAMPLE
     # Generate a solution with only unit test projects
-    ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net10.0 -TestProjectNameIncludeFilter "*UnitTests*" -OutputPath filtered-unit.slnx
+    ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net10.0 -TestProjectNameFilter "*UnitTests*" -OutputPath filtered-unit.slnx
 
 .EXAMPLE
     # Inline usage with dotnet test (PowerShell)
     dotnet test --solution (./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net472) --no-build -f net472
-
-.EXAMPLE
-    # Generate integration tests excluding DurableTask and AzureFunctions
-    ./dotnet/eng/scripts/New-FilteredSolution.ps1 -Solution dotnet/agent-framework-dotnet.slnx -TargetFramework net10.0 -TestProjectNameIncludeFilter "*IntegrationTests*" -TestProjectNameExcludeFilter "*DurableTask.IntegrationTests*","*AzureFunctions.IntegrationTests*" -OutputPath filtered-other-integration.slnx
 #>
 
 [CmdletBinding()]
@@ -64,9 +55,7 @@ param(
 
     [string]$Configuration = "Debug",
 
-    [string]$TestProjectNameIncludeFilter,
-
-    [string[]]$TestProjectNameExcludeFilter,
+    [string]$TestProjectNameFilter,
 
     [switch]$ExcludeSamples,
 
@@ -111,30 +100,13 @@ foreach ($proj in $allProjects) {
     $isTestProject = $projRelPath -like "*tests/*"
 
     # Filter test projects by name pattern if specified
-    if ($isTestProject -and $TestProjectNameIncludeFilter -and ($projFileName -notlike $TestProjectNameIncludeFilter)) {
+    if ($isTestProject -and $TestProjectNameFilter -and ($projFileName -notlike $TestProjectNameFilter)) {
         Write-Verbose "Removing (name filter): $projRelPath"
         $removed += $projRelPath
         $proj.ParentNode.RemoveChild($proj) | Out-Null
         continue
     }
 
-    # Exclude test projects matching any exclusion pattern
-    if ($isTestProject -and $TestProjectNameExcludeFilter) {
-        $excluded = $false
-        foreach ($pattern in $TestProjectNameExcludeFilter) {
-            if ($projFileName -like $pattern) {
-                $excluded = $true
-                break
-            }
-        }
-        if ($excluded) {
-            Write-Verbose "Removing (exclude filter): $projRelPath"
-            $removed += $projRelPath
-            $proj.ParentNode.RemoveChild($proj) | Out-Null
-            continue
-        }
-    }
-
     if (-not (Test-Path $projFullPath)) {
         Write-Verbose "Project not found, keeping in solution: $projRelPath"
         $kept += $projRelPath

dotnet/eng/verify-samples/AgentsSamples.cs

@@ -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
@@ -1170,25 +1151,6 @@ internal static class AgentsSamples
             SkipReason = "Runs as an MCP stdio server that does not exit on its own.",
         },
 
-        new SampleDefinition
-        {
-            Name = "Agent_MCP_LongRunningTask_Client",
-            ProjectPath = "samples/02-agents/ModelContextProtocol/Agent_MCP_LongRunningTask_Client",
-            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
-            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
-            MustContain =
-            [
-                "=== Transparent long-running MCP task (RunAsync) ===",
-                "=== Transparent long-running MCP task (RunStreamingAsync) ===",
-            ],
-            ExpectedOutputDescription =
-            [
-                "The output should show an agent analyzing a dataset named 'sales-2025-q1' and producing a summary mentioning rows, revenue, anomalies, or outliers.",
-                "The output should contain both a non-streaming response (after RunAsync) and a streaming response (after RunStreamingAsync) for the same analysis question.",
-                "The output should not contain error messages or stack traces.",
-            ],
-        },
-
         new SampleDefinition
         {
             Name = "AGUI_Step01_GettingStarted_Client",

dotnet/eng/verify-samples/WorkflowSamples.cs

@@ -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",
@@ -469,17 +478,6 @@ internal static class WorkflowSamples
             ExpectedOutputDescription = ["The output should show a workflow invoking a function tool (e.g. a menu plugin) to answer a question about the soup of the day."],
         },
 
-        new SampleDefinition
-        {
-            Name = "Workflow_Declarative_InvokeFoundryToolboxMcp",
-            ProjectPath = "samples/03-workflows/Declarative/InvokeFoundryToolboxMcp",
-            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME", "FOUNDRY_TOOLBOX_NAME", "FOUNDRY_AGENT_TOOLSET_API_VERSION"],
-            Inputs = ["How do I use Azure OpenAI with my data?"],
-            InputDelayMs = 3000,
-            ExpectedOutputDescription = ["The output should show a workflow using Foundry Toolbox MCP tools to search Microsoft Learn documentation and web search to provide a summary of results."],
-        },
-
         new SampleDefinition
         {
             Name = "Workflow_Declarative_InvokeMcpTool",

dotnet/nuget.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
@@ -9,4 +9,4 @@
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>
-</configuration>
+</configuration>

dotnet/nuget/nuget-package.props

@@ -1,14 +1,13 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.9.0</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <RCNumber>1</RCNumber>
-    <DateSuffix>260603</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="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).260410.1</PackageVersion>
+    <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.260410.1</PackageVersion>
     <PackageVersion Condition="'$(IsReleased)' == 'true'">$(VersionPrefix)</PackageVersion>
-    <GitTag>1.9.0</GitTag>
+    <GitTag>1.1.0</GitTag>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>
@@ -30,8 +29,7 @@
 
     <!-- Report low, moderate, high and critical advisories -->
     <NuGetAuditLevel>low</NuGetAuditLevel>
-
-
+    
     <!-- Default description and tags. Packages can override. -->
     <Authors>Microsoft</Authors>
     <Company>Microsoft</Company>

dotnet/samples/01-get-started/04_memory/Program.cs

@@ -50,12 +50,12 @@ Console.WriteLine(await agent.RunAsync("My name is Ruaidhrí", session));
 Console.WriteLine(await agent.RunAsync("I am 20 years old", session));
 
 // We can serialize the session. The serialized state will include the state of the memory component.
-JsonElement sessionElement = await agent.SerializeSessionAsync(session);
+JsonElement sesionElement = await agent.SerializeSessionAsync(session);
 
 Console.WriteLine("\n>> Use deserialized session with previously created memories\n");
 
 // Later we can deserialize the session and continue the conversation with the previous memory component state.
-var deserializedSession = await agent.DeserializeSessionAsync(sessionElement);
+var deserializedSession = await agent.DeserializeSessionAsync(sesionElement);
 Console.WriteLine(await agent.RunAsync("What is my name and age?", deserializedSession));
 
 Console.WriteLine("\n>> Read memories using memory component\n");

dotnet/samples/02-agents/A2A/A2AAgent_ProtocolSelection/A2AAgent_ProtocolSelection.csproj

@@ -1,19 +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="A2A" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.A2A\Microsoft.Agents.AI.A2A.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/A2A/A2AAgent_ProtocolSelection/Program.cs

@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to select the A2A protocol binding (HTTP+JSON vs JSON-RPC) when
-// creating an AIAgent from an A2A agent card using A2AClientOptions.PreferredBindings.
-
-using A2A;
-using Microsoft.Agents.AI;
-
-var a2aAgentHost = Environment.GetEnvironmentVariable("A2A_AGENT_HOST") ?? throw new InvalidOperationException("A2A_AGENT_HOST is not set.");
-
-// Initialize an A2ACardResolver to get an A2A agent card.
-A2ACardResolver agentCardResolver = new(new Uri(a2aAgentHost));
-
-// Get the agent card
-AgentCard agentCard = await agentCardResolver.GetAgentCardAsync();
-
-// Use A2AClientOptions to explicitly select the HTTP+JSON protocol binding.
-// This tells the A2A client factory to prefer the HTTP+JSON interface when the agent card
-// advertises multiple supported interfaces.
-A2AClientOptions options = new()
-{
-    PreferredBindings = [ProtocolBindingNames.HttpJson]
-};
-
-// To prefer JSON-RPC instead, use:
-// A2AClientOptions options = new()
-// {
-//     PreferredBindings = [ProtocolBindingNames.JsonRpc]
-// };
-
-// Create an instance of the AIAgent for an existing A2A agent, using the specified protocol binding.
-AIAgent agent = agentCard.AsAIAgent(options: options);
-
-// Invoke the agent and output the text result.
-AgentResponse response = await agent.RunAsync("Tell me a joke about a pirate.");
-Console.WriteLine(response);

dotnet/samples/02-agents/A2A/A2AAgent_ProtocolSelection/README.md

@@ -1,27 +0,0 @@
-# A2A Agent Protocol Selection
-
-This sample demonstrates how to select the A2A protocol binding when creating an `AIAgent` from an A2A agent card.
-
-A2A agents can expose multiple interfaces with different protocol bindings (e.g., HTTP+JSON, JSON-RPC). By default, `AsAIAgent()` prefers HTTP+JSON with JSON-RPC as a fallback. This sample shows how to use `A2AClientOptions.PreferredBindings` to explicitly control which protocol binding is used.
-
-The sample:
-
-- Connects to an A2A agent server specified in the `A2A_AGENT_HOST` environment variable
-- Configures `A2AClientOptions` to prefer the HTTP+JSON protocol binding
-- Creates an `AIAgent` from the resolved agent card using the specified binding
-- Sends a message to the agent and displays the response
-
-## Prerequisites
-
-Before you begin, ensure you have the following prerequisites:
-
-- .NET 10.0 SDK or later
-- An A2A agent server running and accessible via HTTP
-
-**Note**: These samples need to be run against a valid A2A server. If no A2A server is available, they can be run against the echo-agent that can be spun up locally by following the guidelines at: https://github.com/a2aproject/a2a-dotnet/blob/main/samples/AgentServer/README.md
-
-Set the following environment variable:
-
-```powershell
-$env:A2A_AGENT_HOST="http://localhost:5000"  # Replace with your A2A agent server host
-```

dotnet/samples/02-agents/A2A/A2AAgent_StreamReconnection/A2AAgent_StreamReconnection.csproj

@@ -1,23 +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="A2A" />
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.A2A\Microsoft.Agents.AI.A2A.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/A2A/A2AAgent_StreamReconnection/Program.cs

@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to reconnect to an A2A agent's streaming response using continuation tokens,
-// allowing recovery from stream interruptions without losing progress.
-
-using A2A;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-var a2aAgentHost = Environment.GetEnvironmentVariable("A2A_AGENT_HOST") ?? throw new InvalidOperationException("A2A_AGENT_HOST is not set.");
-
-// Initialize an A2ACardResolver to get an A2A agent card.
-A2ACardResolver agentCardResolver = new(new Uri(a2aAgentHost));
-
-// Get the agent card
-AgentCard agentCard = await agentCardResolver.GetAgentCardAsync();
-
-// Create an instance of the AIAgent for an existing A2A agent specified by the agent card.
-AIAgent agent = agentCard.AsAIAgent();
-
-AgentSession session = await agent.CreateSessionAsync();
-
-ResponseContinuationToken? continuationToken = null;
-
-await foreach (var update in agent.RunStreamingAsync("Conduct a comprehensive analysis of quantum computing applications in cryptography, including recent breakthroughs, implementation challenges, and future roadmap. Please include diagrams and visual representations to illustrate complex concepts.", session))
-{
-    // Saving the continuation token to be able to reconnect to the same response stream later.
-    // Note: Continuation tokens are only returned for long-running tasks. If the underlying A2A agent
-    // returns a message instead of a task, the continuation token will not be initialized.
-    // A2A agents do not support stream resumption from a specific point in the stream,
-    // but only reconnection to obtain the same response stream from the beginning.
-    // So, A2A agents will return an initialized continuation token in the first update
-    // representing the beginning of the stream, and it will be null in all subsequent updates.
-    if (update.ContinuationToken is { } token)
-    {
-        continuationToken = token;
-    }
-
-    // Imitating stream interruption
-    break;
-}
-
-// Reconnect to the same response stream using the continuation token obtained from the previous run.
-// As a first update, the agent will return an update representing the current state of the response at the moment of calling
-// RunStreamingAsync with the same continuation token, followed by other updates until the end of the stream is reached.
-if (continuationToken is not null)
-{
-    await foreach (var update in agent.RunStreamingAsync(session, options: new() { ContinuationToken = continuationToken }))
-    {
-        if (!string.IsNullOrEmpty(update.Text))
-        {
-            Console.WriteLine(update.Text);
-        }
-    }
-}

dotnet/samples/02-agents/A2A/A2AAgent_StreamReconnection/README.md

@@ -1,29 +0,0 @@
-# A2A Agent Stream Reconnection
-
-This sample demonstrates how to reconnect to an A2A agent's streaming response using continuation tokens, allowing recovery from stream interruptions without losing progress.
-
-The sample:
-
-- Connects to an A2A agent server specified in the `A2A_AGENT_HOST` environment variable
-- Sends a request to the agent and begins streaming the response
-- Captures a continuation token from the stream for later reconnection
-- Simulates a stream interruption by breaking out of the streaming loop
-- Reconnects to the same response stream using the captured continuation token
-- Displays the response received after reconnection
-
-This pattern is useful when network interruptions or other failures may disrupt an ongoing streaming response, and you need to recover and continue processing.
-
-> **Note:** Continuation tokens are only available when the underlying A2A agent returns a task. If the agent returns a message instead, the continuation token will not be initialized and stream reconnection is not applicable.
-
-# Prerequisites
-
-Before you begin, ensure you have the following prerequisites:
-
-- .NET 10.0 SDK or later
-- An A2A agent server running and accessible via HTTP
-
-Set the following environment variable:
-
-```powershell
-$env:A2A_AGENT_HOST="http://localhost:5000"  # Replace with your A2A agent server host
-```

dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Program.cs

@@ -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"]

dotnet/samples/02-agents/AGUI/Step01_GettingStarted/Server/Server.csproj

@@ -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>
 

dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Program.cs

@@ -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"]

dotnet/samples/02-agents/AGUI/Step02_BackendTools/Server/Server.csproj

@@ -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>
 

dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Program.cs

@@ -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"]

dotnet/samples/02-agents/AGUI/Step03_FrontendTools/Server/Server.csproj

@@ -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>
 

dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Program.cs

@@ -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();

dotnet/samples/02-agents/AGUI/Step04_HumanInLoop/Server/Server.csproj

@@ -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>
 

dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Program.cs

@@ -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"]

dotnet/samples/02-agents/AGUI/Step05_StateManagement/Server/Server.csproj

@@ -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>
 

dotnet/samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Program.cs

@@ -12,9 +12,7 @@ static Task<PermissionRequestResult> PromptPermission(PermissionRequest request,
     Console.Write("Approve? (y/n): ");
 
     string? input = Console.ReadLine()?.Trim().ToUpperInvariant();
-    PermissionRequestResultKind kind = input is "Y" or "YES"
-                                     ? PermissionRequestResultKind.Approved
-                                     : PermissionRequestResultKind.Rejected;
+    string kind = input is "Y" or "YES" ? "approved" : "denied-interactively-by-user";
 
     return Task.FromResult(new PermissionRequestResult { Kind = kind });
 }

dotnet/samples/02-agents/AgentSkills/Agent_Step01_FileBasedSkills/Program.cs

@@ -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()

dotnet/samples/02-agents/AgentSkills/Agent_Step03_ClassBasedSkills/Program.cs

@@ -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>
 {

dotnet/samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills/Agent_Step06_McpBasedSkills.csproj

@@ -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>

dotnet/samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills/Program.cs

@@ -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;
-}

dotnet/samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills/README.md

@@ -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
-```

dotnet/samples/02-agents/AgentSkills/README.md

@@ -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
 

dotnet/samples/02-agents/AgentSkills/SubprocessScriptRunner.cs

@@ -5,16 +5,16 @@
 // This is provided for demonstration purposes only.
 
 using System.Diagnostics;
-using System.Text.Json;
 using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
 
 /// <summary>
 /// Executes file-based skill scripts as local subprocesses.
 /// </summary>
 /// <remarks>
-/// This runner uses the script's absolute path and converts the arguments
-/// to CLI arguments. When the LLM sends a JSON array, each element is used
-/// as a positional argument. It is intended for demonstration purposes only.
+/// This runner uses the script's absolute path, converts the arguments
+/// to CLI flags, and returns captured output. It is intended for
+/// demonstration purposes only.
 /// </remarks>
 internal static class SubprocessScriptRunner
 {
@@ -24,8 +24,7 @@ internal static class SubprocessScriptRunner
     public static async Task<object?> RunAsync(
         AgentFileSkill skill,
         AgentFileSkillScript script,
-        JsonElement? arguments,
-        IServiceProvider? serviceProvider,
+        AIFunctionArguments arguments,
         CancellationToken cancellationToken)
     {
         if (!File.Exists(script.FullPath))
@@ -62,27 +61,24 @@ internal static class SubprocessScriptRunner
             startInfo.FileName = script.FullPath;
         }
 
-        if (arguments is { ValueKind: JsonValueKind.Array } json)
+        if (arguments is not null)
         {
-            // Positional CLI arguments
-            foreach (var element in json.EnumerateArray())
+            foreach (var (key, value) in arguments)
             {
-                if (element.ValueKind != JsonValueKind.String)
+                if (value is bool boolValue)
                 {
-                    throw new InvalidOperationException(
-                        $"File-based skill scripts only accept string CLI arguments but received a JSON element of kind '{element.ValueKind}'. " +
-                        "All array elements must be JSON strings.");
+                    if (boolValue)
+                    {
+                        startInfo.ArgumentList.Add(NormalizeKey(key));
+                    }
+                }
+                else if (value is not null)
+                {
+                    startInfo.ArgumentList.Add(NormalizeKey(key));
+                    startInfo.ArgumentList.Add(value.ToString()!);
                 }
-
-                startInfo.ArgumentList.Add(element.GetString()!);
             }
         }
-        else if (arguments is not null && arguments.Value.ValueKind != JsonValueKind.Null && arguments.Value.ValueKind != JsonValueKind.Undefined)
-        {
-            throw new InvalidOperationException(
-                $"Expected a JSON array of CLI arguments but received {arguments.Value.ValueKind}. " +
-                "File-based skill scripts expect positional arguments as a JSON array of strings.");
-        }
 
         Process? process = null;
         try
@@ -132,4 +128,10 @@ internal static class SubprocessScriptRunner
             process?.Dispose();
         }
     }
+
+    /// <summary>
+    /// Normalizes a parameter key to a consistent --flag format.
+    /// Models may return keys with or without leading dashes (e.g., "value" vs "--value").
+    /// </summary>
+    private static string NormalizeKey(string key) => "--" + key.TrimStart('-');
 }

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step01_Interpreter/AgentWithCodeAct_Step01_Interpreter.csproj

@@ -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.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Hyperlight\Microsoft.Agents.AI.Hyperlight.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step01_Interpreter/Program.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to use HyperlightCodeActProvider as a sandboxed Python
-// code interpreter: the model can write and execute arbitrary Python code to
-// answer quantitative questions without calling any additional tools.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hyperlight;
-using OpenAI.Chat;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-var guestPath = Environment.GetEnvironmentVariable("HYPERLIGHT_PYTHON_GUEST_PATH") ?? throw new InvalidOperationException("HYPERLIGHT_PYTHON_GUEST_PATH is not set.");
-
-using var codeAct = new HyperlightCodeActProvider(HyperlightCodeActProviderOptions.CreateForWasm(guestPath));
-
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new DefaultAzureCredential())
-    .GetChatClient(deploymentName)
-    .AsAIAgent(new ChatClientAgentOptions()
-    {
-        ChatOptions = new() { Instructions = "You are a helpful assistant. When the user asks something quantitative, write Python and call `execute_code` instead of guessing." },
-        AIContextProviders = [codeAct],
-    });
-
-Console.WriteLine(await agent.RunAsync("What is the 20th Fibonacci number?"));
-Console.WriteLine(await agent.RunAsync("Compute the mean and standard deviation of [1, 4, 9, 16, 25, 36]."));

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step01_Interpreter/README.md

@@ -1,35 +0,0 @@
-# AgentWithCodeAct_Step01_Interpreter
-
-A minimal CodeAct sample. The agent uses `HyperlightCodeActProvider` as a
-sandboxed Python interpreter: when the user asks something quantitative, the
-model writes Python and invokes the `execute_code` tool rather than answering
-from memory.
-
-## Configuration
-
-| Variable                       | Description                                                                               |
-|--------------------------------|-------------------------------------------------------------------------------------------|
-| `AZURE_OPENAI_ENDPOINT`        | Azure OpenAI endpoint. Required.                                                          |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Azure OpenAI deployment. Defaults to `gpt-5.4-mini`.                                      |
-| `HYPERLIGHT_PYTHON_GUEST_PATH` | Absolute path to the Hyperlight Python guest module (`.wasm` or `.aot` file). Required.   |
-
-Authentication uses `DefaultAzureCredential`.
-
-## Getting the guest module
-
-The Python guest module is built from the
-[hyperlight-dev/hyperlight-sandbox](https://github.com/hyperlight-dev/hyperlight-sandbox)
-repository — see its README for the exact `cargo`/`just` invocations and
-the location of the resulting `.wasm` / `.aot` file. Set
-`HYPERLIGHT_PYTHON_GUEST_PATH` to the absolute path of that artifact
-before running the sample.
-
-Hyperlight requires a hardware virtualization back end on the host:
-KVM on Linux or WHP (Windows Hypervisor Platform) on Windows.
-
-## Run
-
-```shell
-cd AgentWithCodeAct_Step01_Interpreter
-dotnet run
-```

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step02_ToolEnabled/AgentWithCodeAct_Step02_ToolEnabled.csproj

@@ -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.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Hyperlight\Microsoft.Agents.AI.Hyperlight.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step02_ToolEnabled/Program.cs

@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to use HyperlightCodeActProvider with provider-owned
-// tools (exposed inside the sandbox via `call_tool(...)`). The model can
-// orchestrate those tools in a single Python block, reducing round-trips. A
-// sensitive tool (`send_email`) is additionally wrapped in
-// ApprovalRequiredAIFunction so any code that reaches it requires user approval
-// for the entire execute_code invocation.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hyperlight;
-using Microsoft.Extensions.AI;
-using OpenAI.Chat;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-var guestPath = Environment.GetEnvironmentVariable("HYPERLIGHT_PYTHON_GUEST_PATH") ?? throw new InvalidOperationException("HYPERLIGHT_PYTHON_GUEST_PATH is not set.");
-
-AIFunction fetchDocs = AIFunctionFactory.Create(
-    (string topic) => $"Docs for {topic}: (...)",
-    name: "fetch_docs",
-    description: "Fetch documentation for a given topic.");
-
-AIFunction queryData = AIFunctionFactory.Create(
-    (string query) => $"Rows for `{query}`: []",
-    name: "query_data",
-    description: "Run a read-only SQL-like query against the sample store.");
-
-AIFunction sendEmail = new ApprovalRequiredAIFunction(
-    AIFunctionFactory.Create(
-        (string to, string subject) => $"Sent '{subject}' to {to}.",
-        name: "send_email",
-        description: "Send an email on behalf of the user."));
-
-var options = HyperlightCodeActProviderOptions.CreateForWasm(guestPath);
-options.Tools = [fetchDocs, queryData, sendEmail];
-
-using var codeAct = new HyperlightCodeActProvider(options);
-
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new DefaultAzureCredential())
-    .GetChatClient(deploymentName)
-    .AsAIAgent(new ChatClientAgentOptions()
-    {
-        ChatOptions = new() { Instructions = "You are a helpful assistant. Prefer orchestrating your work in a single `execute_code` block using `call_tool(...)` over issuing many direct tool calls." },
-        AIContextProviders = [codeAct],
-    });
-
-Console.WriteLine(await agent.RunAsync("Look up docs on 'retries' and query the 'orders' table, then summarize."));

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step02_ToolEnabled/README.md

@@ -1,34 +0,0 @@
-# AgentWithCodeAct_Step02_ToolEnabled
-
-Demonstrates adding provider-owned tools to `HyperlightCodeActProvider`. Those
-tools are **only** available to code running inside the sandbox via
-`call_tool("<name>", ...)` — they are never exposed to the model as direct
-tools. This lets the model orchestrate multiple tool calls in a single Python
-block.
-
-One tool (`send_email`) is wrapped in `ApprovalRequiredAIFunction`, which causes
-the entire `execute_code` invocation to require user approval when that tool
-is configured.
-
-## Configuration
-
-| Variable                       | Description                                                                               |
-|--------------------------------|-------------------------------------------------------------------------------------------|
-| `AZURE_OPENAI_ENDPOINT`        | Azure OpenAI endpoint. Required.                                                          |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Azure OpenAI deployment. Defaults to `gpt-5.4-mini`.                                      |
-| `HYPERLIGHT_PYTHON_GUEST_PATH` | Absolute path to the Hyperlight Python guest module (`.wasm` or `.aot` file). Required.   |
-
-## Run
-
-```shell
-cd AgentWithCodeAct_Step02_ToolEnabled
-dotnet run
-```
-
-## Planned follow-up
-
-A more realistic "upload a file (e.g. an Excel workbook), have the agent
-analyze it with code" sample is planned as a separate step that will use
-`HostInputDirectory` together with a guest tool capable of reading the
-uploaded file. It will be added in a follow-up PR once the corresponding
-guest module support is in place.

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step03_ManualWiring/AgentWithCodeAct_Step03_ManualWiring.csproj

@@ -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.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Hyperlight\Microsoft.Agents.AI.Hyperlight.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step03_ManualWiring/Program.cs

@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample shows how to wire up CodeAct manually using
-// HyperlightExecuteCodeFunction rather than the AIContextProvider. Use this
-// when you want a fixed tool surface for the agent's lifetime and don't need
-// the per-run snapshot/registry semantics of HyperlightCodeActProvider.
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hyperlight;
-using Microsoft.Extensions.AI;
-using OpenAI.Chat;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-var guestPath = Environment.GetEnvironmentVariable("HYPERLIGHT_PYTHON_GUEST_PATH") ?? throw new InvalidOperationException("HYPERLIGHT_PYTHON_GUEST_PATH is not set.");
-
-AIFunction calculate = AIFunctionFactory.Create(
-    (double a, double b) => a * b,
-    name: "multiply",
-    description: "Multiply two numbers.");
-
-var options = HyperlightCodeActProviderOptions.CreateForWasm(guestPath);
-options.Tools = [calculate];
-
-using var executeCode = new HyperlightExecuteCodeFunction(options);
-
-var instructions =
-    "You are a helpful assistant. When math is involved, solve it by writing Python "
-    + "and calling `execute_code` instead of computing values yourself.\n\n"
-    + executeCode.BuildInstructions(toolsVisibleToModel: false);
-
-AIAgent agent = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new DefaultAzureCredential())
-    .GetChatClient(deploymentName)
-    .AsAIAgent(instructions: instructions, tools: [executeCode]);
-
-Console.WriteLine(await agent.RunAsync("What is 12.3 * 4.5? Use the multiply tool from within `execute_code`."));

dotnet/samples/02-agents/AgentWithCodeAct/AgentWithCodeAct_Step03_ManualWiring/README.md

@@ -1,21 +0,0 @@
-# AgentWithCodeAct_Step03_ManualWiring
-
-Shows how to wire CodeAct manually using `HyperlightExecuteCodeFunction` as a
-direct agent tool instead of via an `AIContextProvider`. This is useful when
-the sandbox's tool surface and capabilities are fixed for the agent's
-lifetime, avoiding per-run snapshot/restore of the provider registry.
-
-## Configuration
-
-| Variable                       | Description                                                                               |
-|--------------------------------|-------------------------------------------------------------------------------------------|
-| `AZURE_OPENAI_ENDPOINT`        | Azure OpenAI endpoint. Required.                                                          |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Azure OpenAI deployment. Defaults to `gpt-5.4-mini`.                                      |
-| `HYPERLIGHT_PYTHON_GUEST_PATH` | Absolute path to the Hyperlight Python guest module (`.wasm` or `.aot` file). Required.   |
-
-## Run
-
-```shell
-cd AgentWithCodeAct_Step03_ManualWiring
-dotnet run
-```

dotnet/samples/02-agents/AgentWithCodeAct/README.md

@@ -1,16 +0,0 @@
-# Agent Framework CodeAct (Hyperlight) Samples
-
-These samples show how to enable an agent to write and execute code in a
-Hyperlight-backed sandbox via the CodeAct pattern. Guest code can be pure
-Python (interpreter mode) or orchestrate host-provided tools through
-`call_tool(...)` — all inside a secure sandbox with opt-in filesystem and
-network access.
-
-|Sample|Description|
-|---|---|
-|[Code interpreter](./AgentWithCodeAct_Step01_Interpreter/)|Uses `HyperlightCodeActProvider` as a sandboxed Python interpreter with no host tools.|
-|[Tool-enabled CodeAct](./AgentWithCodeAct_Step02_ToolEnabled/)|Registers provider-owned tools that guest code can orchestrate via `call_tool(...)`, with an approval-required tool for sensitive actions.|
-|[Manual wiring](./AgentWithCodeAct_Step03_ManualWiring/)|Uses `HyperlightExecuteCodeFunction` directly as an agent tool when the sandbox configuration is fixed.|
-
-All samples require a Hyperlight Python guest module. Set
-`HYPERLIGHT_PYTHON_GUEST_PATH` to its absolute path before running.

dotnet/samples/02-agents/Agents/Agent_Step19_InFunctionLoopCheckpointing/Program.cs

@@ -8,11 +8,6 @@
 // even if the process is interrupted mid-loop, but may also result in chat history that is not
 // yet finalized (e.g., tool calls without results) being persisted, which may be undesirable in some cases.
 //
-// Additionally, this sample demonstrates the MessageInjectingChatClient feature, which allows tool
-// code to inject new user messages during the function execution loop. When a tool or anything else enqueues
-// a message via MessageInjectingChatClient.EnqueueMessages during the tool execution loop, the PerServiceCallChatHistoryPersistingChatClient
-// detects the pending message before the next service call and includes the injected message in the request.
-//
 // To use end-of-run persistence instead (atomic run semantics), remove the
 // RequirePerServiceCallChatHistoryPersistence = true setting (or set it to false). End-of-run
 // persistence is the default behavior.
@@ -59,37 +54,6 @@ static string GetTime([Description("The city name.")] string city) =>
         _ => $"{city}: time data not available."
     };
 
-// This tool demonstrates message injection during the function execution loop.
-// When called, it checks travel advisories for a city. If an advisory is active, it uses
-// the ambient run context to resolve MessageInjectingChatClient and injects a follow-up user message
-// asking for alternative destinations. The model will process this injected message on the next
-// service call — even though the parent FunctionInvokingChatClient loop would otherwise stop.
-[Description("Check current travel advisories for a city.")]
-static string CheckTravelAdvisory([Description("The city name.")] string city)
-{
-    // Simulated travel advisory data.
-    var advisory = city.ToUpperInvariant() switch
-    {
-        "LONDON" => "Travel advisory: Severe fog warnings in London. Flights may be delayed or cancelled.",
-        "SEATTLE" => "Travel advisory: Heavy rainfall expected. Flooding possible in low-lying areas.",
-        _ => null
-    };
-
-    if (advisory is null)
-    {
-        return $"{city}: No active travel advisories.";
-    }
-
-    // When an advisory is found, inject a follow-up question so the model automatically
-    // suggests alternatives without the user needing to ask.
-    var runContext = AIAgent.CurrentRunContext!;
-    runContext.Agent.GetService<MessageInjectingChatClient>()?.EnqueueMessages(
-        runContext.Session!,
-        [new ChatMessage(ChatRole.User, $"Given the travel advisory for {city}, what alternative cities would you recommend instead?")]);
-
-    return advisory;
-}
-
 // Create the agent — per-service-call persistence is enabled via RequirePerServiceCallChatHistoryPersistence.
 // The in-memory ChatHistoryProvider is used by default when the service does not require service stored chat
 // history, so for those cases, we can inspect the chat history via session.TryGetInMemoryChatHistory().
@@ -101,11 +65,10 @@ AIAgent agent = chatClient.AsAIAgent(
     {
         Name = "WeatherAssistant",
         RequirePerServiceCallChatHistoryPersistence = true,
-        EnableMessageInjection = true,
         ChatOptions = new()
         {
-            Instructions = "You are a helpful travel assistant. When asked about cities, call the appropriate tools for each city.",
-            Tools = [AIFunctionFactory.Create(GetWeather), AIFunctionFactory.Create(GetTime), AIFunctionFactory.Create(CheckTravelAdvisory)]
+            Instructions = "You are a helpful assistant. When asked about multiple cities, call the appropriate tool for each city.",
+            Tools = [AIFunctionFactory.Create(GetWeather), AIFunctionFactory.Create(GetTime)]
         },
     });
 
@@ -146,18 +109,6 @@ async Task RunNonStreamingAsync()
     response = await agent.RunAsync(FollowUp2, session);
     PrintAgentResponse(response.Text);
     PrintChatHistory(session, "After third run", ref lastChatHistorySize, ref lastConversationId);
-
-    // Fourth turn — demonstrates message injection during the function loop.
-    // The CheckTravelAdvisory tool detects an advisory for London and injects a follow-up
-    // user message asking for alternative cities. After the tool completes, the internal loop
-    // in PerServiceCallChatHistoryPersistingChatClient detects the pending injected message
-    // and calls the service again, so the model answers the follow-up automatically.
-    const string TravelPrompt = "I'm planning to travel to London next week. Check if there are any travel advisories.";
-    PrintUserMessage(TravelPrompt);
-
-    response = await agent.RunAsync(TravelPrompt, session);
-    PrintAgentResponse(response.Text);
-    PrintChatHistory(session, "After travel advisory run", ref lastChatHistorySize, ref lastConversationId);
 }
 
 async Task RunStreamingAsync()
@@ -230,30 +181,6 @@ async Task RunStreamingAsync()
 
     Console.WriteLine();
     PrintChatHistory(session, "After third run", ref lastChatHistorySize, ref lastConversationId);
-
-    // Fourth turn — demonstrates message injection during the function loop (streaming).
-    // The CheckTravelAdvisory tool detects an advisory for London and injects a follow-up
-    // user message asking for alternative cities. After the tool completes, the internal loop
-    // in PerServiceCallChatHistoryPersistingChatClient detects the pending injected message
-    // and calls the service again, so the model answers the follow-up automatically.
-    const string TravelPrompt = "I'm planning to travel to London next week. Check if there are any travel advisories.";
-    PrintUserMessage(TravelPrompt);
-
-    Console.ForegroundColor = ConsoleColor.Cyan;
-    Console.Write("\n[Agent] ");
-    Console.ResetColor();
-
-    await foreach (var update in agent.RunStreamingAsync(TravelPrompt, session))
-    {
-        Console.Write(update);
-
-        // During streaming we should be able to see updates to the chat history
-        // before the full run completes, as each service call is made and persisted.
-        PrintChatHistory(session, "During travel advisory run", ref lastChatHistorySize, ref lastConversationId);
-    }
-
-    Console.WriteLine();
-    PrintChatHistory(session, "After travel advisory run", ref lastChatHistorySize, ref lastConversationId);
 }
 
 void PrintUserMessage(string message)

dotnet/samples/02-agents/Agents/Agent_Step20_DynamicFunctionTools/Agent_Step20_DynamicFunctionTools.csproj

@@ -1,20 +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.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/Agents/Agent_Step20_DynamicFunctionTools/Program.cs

@@ -1,281 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to dynamically expand the set of function tools available to an
-// agent during a function-calling loop. The agent starts with a single "RequestTools" function.
-// When the model calls RequestTools with a description of the capabilities needed, the function
-// uses the ambient FunctionInvocationContext to add new tools to ChatOptions.Tools. The agent
-// can then use the newly added tools in subsequent iterations of the same function-calling loop.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-
-// Pre-defined tool implementations that can be loaded on demand.
-[Description("Get the current weather for a city.")]
-static string GetWeather([Description("The city name.")] string city) =>
-    city.ToUpperInvariant() switch
-    {
-        "SEATTLE" => "Seattle: 55°F, cloudy with light rain.",
-        "NEW YORK" => "New York: 72°F, sunny and warm.",
-        "LONDON" => "London: 48°F, overcast with fog.",
-        _ => $"{city}: weather data not available, please provide one of the following city names: 'Seattle', 'New York', 'London'."
-    };
-
-[Description("Get the current local time for a city.")]
-static string GetTime([Description("The city name.")] string city) =>
-    city.ToUpperInvariant() switch
-    {
-        "SEATTLE" => "Seattle: 9:00 AM PST",
-        "NEW YORK" => "New York: 12:00 PM EST",
-        "LONDON" => "London: 5:00 PM GMT",
-        _ => $"{city}: time data not available, please provide one of the following city names: 'Seattle', 'New York', 'London'."
-    };
-
-[Description("Convert a temperature from Fahrenheit to Celsius.")]
-static string ConvertFahrenheitToCelsius([Description("The temperature in Fahrenheit.")] double fahrenheit) =>
-    $"{fahrenheit}°F = {(fahrenheit - 32) * 5 / 9:F1}°C";
-
-// A registry of tool sets that can be loaded by description keyword.
-Dictionary<string, List<AITool>> toolCatalog = new(StringComparer.OrdinalIgnoreCase)
-{
-    ["weather"] = [AIFunctionFactory.Create(GetWeather, name: "GetWeather")],
-    ["time"] = [AIFunctionFactory.Create(GetTime, name: "GetTime")],
-    ["temperature"] = [AIFunctionFactory.Create(ConvertFahrenheitToCelsius, name: "ConvertFahrenheitToCelsius")],
-};
-
-// The RequestTools function uses the ambient FunctionInvocationContext to add tools dynamically.
-AIFunction requestToolsFunction = AIFunctionFactory.Create(
-    [Description("Request additional tools to be loaded based on a description of the functionality needed. " +
-                 "Call this when you need capabilities that are not yet available in your current tool set.")] (
-        [Description("A description of the functionality required, e.g. 'weather', 'time', or 'temperature conversion'.")] string description
-    ) =>
-    {
-        // Access the ambient FunctionInvocationContext provided by FunctionInvokingChatClient.
-        var context = FunctionInvokingChatClient.CurrentContext
-            ?? throw new InvalidOperationException("No ambient FunctionInvocationContext available.");
-
-        var tools = context.Options?.Tools;
-        if (tools is null)
-        {
-            return "Unable to register new tools: ChatOptions.Tools is not available.";
-        }
-
-        // Find matching tool sets from the catalog.
-        List<string> addedToolNames = [];
-        foreach (var kvp in toolCatalog)
-        {
-            var keyword = kvp.Key;
-            var catalogTools = kvp.Value;
-            if (description.Contains(keyword, StringComparison.OrdinalIgnoreCase))
-            {
-                foreach (var tool in catalogTools)
-                {
-                    // Avoid adding duplicates.
-                    if (tool is AIFunction fn && !tools.Any(t => t is AIFunction existing && existing.Name == fn.Name))
-                    {
-                        tools.Add(tool);
-                        addedToolNames.Add(fn.Name);
-                    }
-                }
-            }
-        }
-
-        return addedToolNames.Count > 0
-            ? "Successfully loaded tools"
-            : $"No tools matched the description '{description}'. Available categories: {string.Join(", ", toolCatalog.Keys)}.";
-    },
-    name: "RequestTools");
-
-// Create the agent with only the RequestTools function initially.
-// Insert chat client middleware that logs the tools available on each LLM call,
-// making the dynamic expansion visible in the console output.
-// 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(endpoint),
-    new DefaultAzureCredential())
-    .GetChatClient(deploymentName)
-    .AsIChatClient()
-    .AsBuilder()
-    .Use(getResponseFunc: ToolLoggingMiddleware, getStreamingResponseFunc: ToolLoggingStreamingMiddleware)
-    .BuildAIAgent(
-        instructions: """
-            You are a helpful assistant. You start with limited tools.
-            When you need functionality that you don't currently have, call RequestTools with a description
-            of what you need. After new tools are loaded, use them to answer the user's question.
-            """,
-        tools: [requestToolsFunction]);
-
-// Run a conversation that triggers dynamic tool expansion.
-Console.WriteLine("=== Dynamic Function Tools Sample ===\n");
-
-string[] prompts =
-[
-    "What's the weather like in Seattle and London?",
-    "What time is it in New York?",
-    "Can you convert those temperatures to Celsius?"
-];
-
-// --- Non-Streaming Mode ---
-Console.ForegroundColor = ConsoleColor.Yellow;
-Console.WriteLine("=== Non-Streaming Mode ===");
-Console.ResetColor();
-Console.WriteLine();
-
-AgentSession session = await agent.CreateSessionAsync();
-
-foreach (var prompt in prompts)
-{
-    Console.ForegroundColor = ConsoleColor.Green;
-    Console.Write("[User] ");
-    Console.ResetColor();
-    Console.WriteLine(prompt);
-
-    var response = await agent.RunAsync(prompt, session);
-
-    // Print all message contents including tool calls, tool results, and text.
-    foreach (var message in response.Messages)
-    {
-        foreach (var content in message.Contents)
-        {
-            switch (content)
-            {
-                case FunctionCallContent functionCall:
-                    Console.ForegroundColor = ConsoleColor.Yellow;
-                    Console.WriteLine($"  [Tool Call] {functionCall.Name}({string.Join(", ", functionCall.Arguments?.Select(a => $"{a.Key}: {a.Value}") ?? [])})");
-                    Console.ResetColor();
-                    break;
-
-                case FunctionResultContent functionResult:
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"  [Tool Result] {functionResult.CallId} => {functionResult.Result}");
-                    Console.ResetColor();
-                    break;
-
-                case TextContent textContent when !string.IsNullOrWhiteSpace(textContent.Text):
-                    Console.ForegroundColor = ConsoleColor.Cyan;
-                    Console.Write("[Agent] ");
-                    Console.ResetColor();
-                    Console.WriteLine(textContent.Text);
-                    break;
-            }
-        }
-    }
-
-    Console.WriteLine();
-}
-
-// --- Streaming Mode ---
-Console.ForegroundColor = ConsoleColor.Yellow;
-Console.WriteLine("=== Streaming Mode ===");
-Console.ResetColor();
-Console.WriteLine();
-
-AgentSession streamingSession = await agent.CreateSessionAsync();
-
-foreach (var prompt in prompts)
-{
-    Console.ForegroundColor = ConsoleColor.Green;
-    Console.Write("[User] ");
-    Console.ResetColor();
-    Console.WriteLine(prompt);
-
-    bool inAgentText = false;
-
-    await foreach (var update in agent.RunStreamingAsync(prompt, streamingSession))
-    {
-        foreach (var content in update.Contents)
-        {
-            switch (content)
-            {
-                case FunctionCallContent functionCall:
-                    if (inAgentText)
-                    {
-                        Console.WriteLine();
-                        inAgentText = false;
-                    }
-
-                    Console.ForegroundColor = ConsoleColor.Yellow;
-                    Console.WriteLine($"  [Tool Call] {functionCall.Name}({string.Join(", ", functionCall.Arguments?.Select(a => $"{a.Key}: {a.Value}") ?? [])})");
-                    Console.ResetColor();
-                    break;
-
-                case FunctionResultContent functionResult:
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"  [Tool Result] {functionResult.CallId} => {functionResult.Result}");
-                    Console.ResetColor();
-                    break;
-
-                case TextContent textContent when !string.IsNullOrWhiteSpace(textContent.Text):
-                    if (!inAgentText)
-                    {
-                        Console.ForegroundColor = ConsoleColor.Cyan;
-                        Console.Write("[Agent] ");
-                        Console.ResetColor();
-                        inAgentText = true;
-                    }
-
-                    Console.Write(textContent.Text);
-                    break;
-            }
-        }
-    }
-
-    if (inAgentText)
-    {
-        Console.WriteLine();
-    }
-
-    Console.WriteLine();
-}
-
-// Chat client middleware that logs the number and names of tools on each LLM request.
-async Task<ChatResponse> ToolLoggingMiddleware(
-    IEnumerable<ChatMessage> messages,
-    ChatOptions? options,
-    IChatClient innerChatClient,
-    CancellationToken cancellationToken)
-{
-    LogTools(options);
-
-    return await innerChatClient.GetResponseAsync(messages, options, cancellationToken);
-}
-
-// Streaming version of the tool logging middleware.
-async IAsyncEnumerable<ChatResponseUpdate> ToolLoggingStreamingMiddleware(
-    IEnumerable<ChatMessage> messages,
-    ChatOptions? options,
-    IChatClient innerChatClient,
-    [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
-{
-    LogTools(options);
-
-    await foreach (var update in innerChatClient.GetStreamingResponseAsync(messages, options, cancellationToken))
-    {
-        yield return update;
-    }
-}
-
-// Shared helper to log the current tool set.
-void LogTools(ChatOptions? options)
-{
-    if (options?.Tools is { Count: > 0 } tools)
-    {
-        var toolNames = tools.OfType<AIFunction>().Select(t => t.Name);
-        Console.ForegroundColor = ConsoleColor.DarkGray;
-        Console.WriteLine($"  [Middleware] LLM call with {tools.Count} tool(s): {string.Join(", ", toolNames)}");
-        Console.ResetColor();
-    }
-    else
-    {
-        Console.ForegroundColor = ConsoleColor.DarkGray;
-        Console.WriteLine("  [Middleware] LLM call with 0 tools");
-        Console.ResetColor();
-    }
-}

dotnet/samples/02-agents/Agents/Agent_Step20_DynamicFunctionTools/README.md

@@ -1,38 +0,0 @@
-# Dynamic Function Tools
-
-This sample demonstrates how to dynamically expand the set of function tools available to an agent during a function-calling loop.
-
-## What it demonstrates
-
-- The agent starts with only a single `RequestTools` function
-- When the model needs capabilities it doesn't have, it calls `RequestTools` with a description of the functionality needed
-- The `RequestTools` function uses the ambient `FunctionInvokingChatClient.CurrentContext` to access `ChatOptions.Tools` and add new tools at runtime
-- The agent then uses the newly added tools in subsequent iterations of the same function-calling loop
-
-## How it works
-
-1. A tool catalog maps keywords (e.g. "weather", "time", "temperature") to pre-built `AIFunction` instances
-2. The `RequestTools` function matches the description against catalog keywords and adds matching tools to `ChatOptions.Tools`
-3. `FunctionInvokingChatClient` automatically picks up the new tools on the next iteration of its loop
-
-## Prerequisites
-
-- .NET 10 SDK or later
-- Azure OpenAI service endpoint and deployment configured
-- Azure CLI installed and authenticated (for Azure credential authentication)
-- User has the `Cognitive Services OpenAI Contributor` role for the Azure OpenAI resource
-
-## Running the sample
-
-Set the required environment variables:
-
-```powershell
-$env:AZURE_OPENAI_ENDPOINT="https://your-resource.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
-```
-
-Run the sample:
-
-```powershell
-dotnet run
-```

dotnet/samples/02-agents/Agents/Agent_Step21_ShellWithEnvironment/Agent_Step21_ShellWithEnvironment.csproj

@@ -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.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Tools.Shell\Microsoft.Agents.AI.Tools.Shell.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/Agents/Agent_Step21_ShellWithEnvironment/Program.cs

@@ -1,130 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// Shell tool with environment-aware system prompt
-//
-// WARNING: This sample uses LocalShellExecutor, which executes real commands
-// against the shell on this machine. Approval gating is disabled here so
-// the demo runs unattended; in any real application keep approval on
-// (the default), or use DockerShellExecutor for container isolation. The
-// commands the model emits below are read-only or scoped (echo, cd into
-// a temp folder, set a process-local env var) but a different model or
-// prompt could choose to do something destructive. Run this only in an
-// environment where you are comfortable with the agent typing into your
-// terminal.
-//
-// Demonstrates LocalShellExecutor in both modes paired with
-// ShellEnvironmentProvider, an AIContextProvider that probes the live
-// shell (OS, family, version, CWD, common CLIs) and injects authoritative
-// system-prompt instructions so the agent emits commands in the right
-// idiom (PowerShell vs POSIX).
-//
-// Two runs:
-//   1) Stateless mode: each tool call runs in a fresh shell. Useful when
-//      commands are independent (read-only scripts, version checks, file
-//      listings) and you want strong isolation between calls. Side
-//      effects in one call (cd, exported variables) do NOT carry to the
-//      next.
-//   2) Persistent mode: a single long-lived shell is reused across calls,
-//      so working directory and exported environment variables are
-//      preserved. Useful for multi-step workflows that build state
-//      (cd into a folder and run a sequence of commands there; set a
-//      token in one step and read it in the next).
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Tools.Shell;
-using Microsoft.Extensions.AI;
-using OpenAI.Chat;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-
-var chatClient = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
-    .GetChatClient(deploymentName);
-
-const string Instructions = """
-    You are an agent with a single tool: run_shell. Use it to satisfy the
-    user's request. Do not describe what you would do — actually run the
-    commands. Reply with the final answer derived from real output.
-    """;
-
-// --------------------------------------------------------------------
-// 1. Stateless mode — each call gets a fresh shell.
-// --------------------------------------------------------------------
-Console.WriteLine("### Stateless mode\n");
-await using (var statelessShell = new LocalShellExecutor(new() { Mode = ShellMode.Stateless, AcknowledgeUnsafe = true }))
-{
-    var envProvider = new ShellEnvironmentProvider(statelessShell);
-    var statelessAgent = chatClient.AsAIAgent(new ChatClientAgentOptions
-    {
-        ChatOptions = new()
-        {
-            Instructions = Instructions,
-            Tools = [statelessShell.AsAIFunction(requireApproval: false)],
-        },
-        AIContextProviders = [envProvider],
-    });
-
-    var statelessSession = await statelessAgent.CreateSessionAsync();
-    Console.WriteLine(await statelessAgent.RunAsync("Print the current working directory.", statelessSession));
-    Console.WriteLine();
-
-    // Show that side effects do NOT carry between stateless calls: ask the
-    // agent to cd into the system temp directory in one call, then ask
-    // for the CWD in a second call. Stateless mode means the cd is gone.
-    Console.WriteLine(await statelessAgent.RunAsync("Change directory into the system temp folder, then print the current working directory.", statelessSession));
-    Console.WriteLine();
-    Console.WriteLine(await statelessAgent.RunAsync("In a NEW shell call, print the current working directory again. Tell me whether it matches the temp folder from the previous call.", statelessSession));
-    Console.WriteLine();
-
-    PrintSnapshot(envProvider.CurrentSnapshot!);
-}
-
-// --------------------------------------------------------------------
-// 2. Persistent mode — one shell, reused across calls. State carries.
-// --------------------------------------------------------------------
-Console.WriteLine("\n### Persistent mode\n");
-await using (var persistentShell = new LocalShellExecutor(new() { Mode = ShellMode.Persistent, AcknowledgeUnsafe = true }))
-{
-    var envProvider = new ShellEnvironmentProvider(persistentShell);
-    var persistentAgent = chatClient.AsAIAgent(new ChatClientAgentOptions
-    {
-        ChatOptions = new()
-        {
-            Instructions = Instructions,
-            Tools = [persistentShell.AsAIFunction(requireApproval: false)],
-        },
-        AIContextProviders = [envProvider],
-    });
-
-    var persistentSession = await persistentAgent.CreateSessionAsync();
-
-    // State carries across calls in persistent mode: cd into temp, then
-    // verify the next call sees the new CWD.
-    Console.WriteLine(await persistentAgent.RunAsync("Change directory into the system temp folder, then print the current working directory.", persistentSession));
-    Console.WriteLine();
-    Console.WriteLine(await persistentAgent.RunAsync("In a NEW shell call, print the current working directory again. Tell me whether it still matches the temp folder.", persistentSession));
-    Console.WriteLine();
-
-    // Same idea with an exported variable: set in one call, read in the next.
-    Console.WriteLine(await persistentAgent.RunAsync("Set the environment variable DEMO_TOKEN to the value 'hello-world'.", persistentSession));
-    Console.WriteLine();
-    Console.WriteLine(await persistentAgent.RunAsync("Print the current value of DEMO_TOKEN. Tell me exactly what value the shell reports.", persistentSession));
-    Console.WriteLine();
-
-    PrintSnapshot(envProvider.CurrentSnapshot!);
-}
-
-static void PrintSnapshot(ShellEnvironmentSnapshot snap)
-{
-    Console.WriteLine("--- Captured environment snapshot ---");
-    Console.WriteLine($"  Family:  {snap.Family}");
-    Console.WriteLine($"  OS:      {snap.OSDescription}");
-    Console.WriteLine($"  Shell:   {snap.ShellVersion ?? "(unknown)"}");
-    Console.WriteLine($"  CWD:     {snap.WorkingDirectory}");
-    foreach (var (tool, version) in snap.ToolVersions)
-    {
-        Console.WriteLine($"  {tool,-8} {version ?? "(not installed)"}");
-    }
-}

dotnet/samples/02-agents/Agents/README.md

@@ -46,7 +46,6 @@ Before you begin, ensure you have the following prerequisites:
 |[Providing additional AI Context to an agent using multiple AIContextProviders](./Agent_Step17_AdditionalAIContext/)|This sample demonstrates how to inject additional AI context into a ChatClientAgent using multiple custom AIContextProvider components that are attached to the agent.|
 |[Using compaction pipeline with an agent](./Agent_Step18_CompactionPipeline/)|This sample demonstrates how to use a compaction pipeline to efficiently limit the size of the conversation history for an agent.|
 |[In-function-loop checkpointing](./Agent_Step19_InFunctionLoopCheckpointing/)|This sample demonstrates how to persist chat history after each service call during a tool-calling loop, enabling crash recovery and mid-run observability.|
-|[Dynamic function tools](./Agent_Step20_DynamicFunctionTools/)|This sample demonstrates how to dynamically expand the set of function tools available to an agent during a function-calling loop using the ambient FunctionInvocationContext.|
 
 ## Running the samples from the console
 

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/Agent_Step25_FoundryToolboxMcp.csproj

@@ -1,21 +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" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/Program.cs

@@ -1,149 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// Foundry Toolbox via MCP (Streamable HTTP).
-//
-// Point an `McpClient` at a Foundry Toolbox's MCP endpoint. The agent
-// discovers the toolbox's tools at runtime and invokes them locally.
-
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Net.Http.Headers;
-using Azure.AI.Projects;
-using Azure.AI.Projects.Agents;
-using Azure.Core;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-using ModelContextProtocol.Client;
-using OpenAI.Responses;
-
-#pragma warning disable OPENAI001 // Experimental API
-#pragma warning disable AAIP001  // AgentToolboxes is experimental
-
-// Name of the toolbox to create and connect to.
-const string ToolboxName = "research_toolbox";
-const string Query = "What tools do you have access to?";
-
-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";
-
-TokenCredential credential = new DefaultAzureCredential();
-
-// Comment out if the toolbox already exists in your Foundry project.
-var toolboxEndpoint = await CreateSampleToolboxAsync(ToolboxName, endpoint, credential);
-
-// Inject a fresh Azure AI bearer token on every MCP request.
-using var httpClient = new HttpClient(new BearerTokenHandler(credential, "https://ai.azure.com/.default")
-{
-    InnerHandler = new HttpClientHandler(),
-});
-
-Console.WriteLine($"Connecting to toolbox MCP endpoint: {toolboxEndpoint}");
-
-await using McpClient mcpClient = await McpClient.CreateAsync(
-    new HttpClientTransport(
-        new HttpClientTransportOptions
-        {
-            Endpoint = new Uri(toolboxEndpoint),
-            Name = "foundry_toolbox",
-            TransportMode = HttpTransportMode.StreamableHttp,
-            AdditionalHeaders = new Dictionary<string, string>
-            {
-                ["Foundry-Features"] = "Toolboxes=V1Preview",
-            },
-        },
-        httpClient));
-
-IList<McpClientTool> mcpTools = await mcpClient.ListToolsAsync();
-Console.WriteLine($"Toolbox MCP tools available: {string.Join(", ", mcpTools.Select(t => t.Name))}");
-
-// 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.
-AIProjectClient aiProjectClient = new(new Uri(endpoint), credential);
-
-AIAgent agent = aiProjectClient.AsAIAgent(
-    model: deploymentName,
-    instructions: "You are a helpful assistant. Use the available toolbox tools to answer the user.",
-    name: "ToolboxMcpAgent",
-    tools: [.. mcpTools.Cast<AITool>()]);
-
-Console.WriteLine($"\nUser: {Query}\n");
-Console.WriteLine($"Assistant: {await agent.RunAsync(Query)}");
-
-// ---------------------------------------------------------------------------
-// Helper: create (or replace) a sample toolbox so the sample runs end-to-end
-// ---------------------------------------------------------------------------
-static async Task<string> CreateSampleToolboxAsync(string name, string endpoint, TokenCredential credential)
-{
-    // Toolboxes are normally configured in the Foundry portal or a deployment
-    // script, not the application itself. This helper exists so the sample can
-    // be run end-to-end without first setting a toolbox up by hand.
-
-    // The Foundry-Features header is currently required for toolbox CRUD operations.
-    var options = new AgentAdministrationClientOptions();
-    options.AddPolicy(new FoundryFeaturesPolicy("Toolboxes=V1Preview"), PipelinePosition.PerCall);
-    var adminClient = new AgentAdministrationClient(new Uri(endpoint), credential, options);
-    var toolboxClient = adminClient.GetAgentToolboxes();
-
-    // Delete existing toolbox if present (ignore 404).
-    try
-    {
-        await toolboxClient.DeleteToolboxAsync(name);
-        Console.WriteLine($"Deleted existing toolbox '{name}'");
-    }
-    catch (ClientResultException ex) when (ex.Status == 404)
-    {
-        // Toolbox does not exist — nothing to delete.
-    }
-
-    // Create a fresh version with a single MCP tool.
-    ProjectsAgentTool mcpTool = ProjectsAgentTool.AsProjectTool(ResponseTool.CreateMcpTool(
-        serverLabel: "api-specs",
-        serverUri: new Uri("https://gitmcp.io/Azure/azure-rest-api-specs"),
-        toolCallApprovalPolicy: new McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy.NeverRequireApproval)));
-
-    ToolboxVersion created = (await toolboxClient.CreateToolboxVersionAsync(
-        name: name,
-        tools: [mcpTool],
-        description: "Sample toolbox with an MCP tool — created by Agent_Step25 sample.")).Value;
-
-    Console.WriteLine($"Created toolbox '{created.Name}' v{created.Version} ({created.Tools.Count} tool(s))");
-    return $"{endpoint}/toolboxes/{created.Name}/mcp?api-version=v{created.Version}";
-}
-
-// ---------------------------------------------------------------------------
-// Pipeline policy: adds the Foundry-Features header for toolbox CRUD calls
-// ---------------------------------------------------------------------------
-internal sealed class FoundryFeaturesPolicy(string feature) : PipelinePolicy
-{
-    private const string FeatureHeader = "Foundry-Features";
-
-    public override void Process(PipelineMessage message, IReadOnlyList<PipelinePolicy> pipeline, int currentIndex)
-    {
-        message.Request.Headers.Add(FeatureHeader, feature);
-        ProcessNext(message, pipeline, currentIndex);
-    }
-
-    public override ValueTask ProcessAsync(PipelineMessage message, IReadOnlyList<PipelinePolicy> pipeline, int currentIndex)
-    {
-        message.Request.Headers.Add(FeatureHeader, feature);
-        return ProcessNextAsync(message, pipeline, currentIndex);
-    }
-}
-
-// ---------------------------------------------------------------------------
-// DelegatingHandler: attaches a fresh Azure AI 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);
-    }
-}

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/README.md

@@ -1,32 +0,0 @@
-# Foundry Toolbox via MCP
-
-This sample shows how to use a Foundry Toolbox by pointing an `McpClient` at the toolbox's MCP endpoint. The agent discovers the toolbox's tools at runtime and invokes them locally over MCP.
-
-## 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
-- Passing the discovered MCP tools to `AIProjectClient.AsAIAgent(...)`
-- Optional helper to create (or replace) a sample toolbox in the project so the sample is runnable end-to-end
-
-## Prerequisites
-
-- A Microsoft Foundry project with a toolbox configured (or let the sample create one for you)
-- 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"
-```
-
-The sample creates a toolbox named `research_toolbox` in your Foundry project on
-startup, then connects to its MCP endpoint at
-`{AZURE_AI_PROJECT_ENDPOINT}/toolboxes/research_toolbox/mcp?api-version=v{version}`.
-
-## Run the sample
-
-```powershell
-dotnet run
-```

dotnet/samples/02-agents/AgentsWithFoundry/Agent_Step26_FoundryToolboxMcpSkills/Agent_Step26_FoundryToolboxMcpSkills.csproj

@@ -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>