Python: add test for empty-message pruning in approval result replacement (#5617)

Adds test coverage for the second-pass logic in
`_replace_approval_contents_with_results` that removes messages whose
`contents` list becomes empty after first-pass content removal.

Addresses review comment on PR #5331:
https://github.com/microsoft/agent-framework/pull/5331#discussion_r3129039445

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.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/pr_limit_moderation.js

@@ -1,163 +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,
-    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 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 query = `repo:${owner}/${repo} is:pr is:open author:${author}`;
-  const response = await github.rest.search.issuesAndPullRequests({
-    q: query,
-    per_page: 100,
-  });
-
-  const indexedPrNumbers = response.data.items.map((item) => item.number);
-  const currentPrIsIndexed = indexedPrNumbers.includes(pullRequestNumber);
-  if (currentPrIsIndexed || response.data.total_count >= 100) {
-    return response.data.total_count;
-  }
-
-  return response.data.total_count + 1;
-}
-
-async function enforcePrLimit({ github, context, core, exemptLabelName, maxOpenPrs, labelName }) {
-  const { owner, repo } = context.repo;
-  const { author, labels, number } = getPullRequest(context);
-
-  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_pr_limit_moderation.js

@@ -1,286 +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', labels = [], number = 123 } = {}) {
-  return {
-    repo: {
-      owner: 'microsoft',
-      repo: 'agent-framework',
-    },
-    payload: {
-      pull_request: {
-        number,
-        labels: labels.map((name) => ({ name })),
-        user: {
-          login: author,
-        },
-      },
-    },
-  };
-}
-
-function createCore() {
-  const messages = [];
-  return {
-    messages,
-    info(message) {
-      messages.push(message);
-    },
-  };
-}
-
-function createGithub({ totalCount, itemNumbers, labelExists = true }) {
-  const calls = [];
-
-  return {
-    calls,
-    rest: {
-      search: {
-        async issuesAndPullRequests(params) {
-          calls.push({ api: 'search.issuesAndPullRequests', params });
-          return {
-            data: {
-              total_count: totalCount,
-              items: itemNumbers.map((number) => ({ number })),
-            },
-          };
-        },
-      },
-      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 update(params) {
-          calls.push({ api: 'pulls.update', params });
-          return { data: { state: params.state } };
-        },
-      },
-    },
-  };
-}
-
-
-// ---------------------------------------------------------------------------
-// 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({
-      totalCount: 10,
-      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),
-      ['search.issuesAndPullRequests'],
-    );
-  });
-
-  it('counts the new PR when search has not indexed it yet', async () => {
-    const github = createGithub({
-      totalCount: 10,
-      itemNumbers: [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),
-      [
-        'search.issuesAndPullRequests',
-        'issues.getLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('creates the label when it does not already exist', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      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),
-      [
-        'search.issuesAndPullRequests',
-        '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({
-      totalCount: 11,
-      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),
-      [
-        'search.issuesAndPullRequests',
-        'issues.getLabel',
-        'issues.createLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('uses a diplomatic close message with the configured limit', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      itemNumbers: [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({
-      totalCount: 11,
-      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 over-count when the current PR is not on the first search page', async () => {
-    const github = createGithub({
-      totalCount: 101,
-      itemNumbers: 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

@@ -66,7 +66,7 @@ jobs:
 
       - name: Check PR author team membership
         id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         env:
           TEAM_NAME: ${{ secrets.DEVELOPER_TEAM }}
           PR_NUMBER: ${{ steps.pr.outputs.pr_number }}
@@ -116,7 +116,7 @@ jobs:
     steps:
       # Safe checkout: base repo only, not the untrusted PR head.
       - name: Checkout target repo base
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.base.sha || github.sha }}
           fetch-depth: 0
@@ -125,7 +125,7 @@ jobs:
 
       # Private DevFlow checkout: the PAT/token grants access to this repo's code.
       - name: Checkout DevFlow
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.DEVFLOW_REPOSITORY }}
           ref: ${{ env.DEVFLOW_REF }}
@@ -135,12 +135,12 @@ jobs:
           path: devflow
 
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
+        uses: astral-sh/setup-uv@v7
         with:
           version: "0.11.x"
           enable-cache: true

.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,8 +1,12 @@
 name: Issue Triage
 
 on:
-  issues:
-    types: [opened, labeled]
+  workflow_dispatch:
+    inputs:
+      issue_number:
+        description: Issue number to triage
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -10,13 +14,7 @@ permissions:
   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
-    }}
+  group: issue-triage-${{ github.repository }}-${{ github.event.issue.number || inputs.issue_number || github.run_id }}
   cancel-in-progress: true
 
 env:
@@ -28,7 +26,6 @@ env:
 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 }}
@@ -39,13 +36,18 @@ jobs:
         shell: bash
         env:
           ISSUE_NUMBER_EVENT: ${{ github.event.issue.number }}
+          ISSUE_NUMBER_INPUT: ${{ inputs.issue_number }}
         run: |
           set -euo pipefail
 
-          issue_number="${ISSUE_NUMBER_EVENT}"
+          if [[ "${GITHUB_EVENT_NAME}" == "issues" ]]; then
+            issue_number="${ISSUE_NUMBER_EVENT}"
+          else
+            issue_number="${ISSUE_NUMBER_INPUT}"
+          fi
 
           if [[ ! "$issue_number" =~ ^[1-9][0-9]*$ ]]; then
-            echo "Could not determine issue number from event payload." >&2
+            echo "Could not determine issue number; for workflow_dispatch runs, the 'issue_number' input is required." >&2
             exit 1
           fi
 
@@ -53,7 +55,7 @@ jobs:
           echo "repo=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
 
       - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           sparse-checkout: .github/scripts
           fetch-depth: 1
@@ -61,7 +63,7 @@ jobs:
 
       - name: Check issue author team membership
         id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@v8
         env:
           TEAM_NAME: ${{ secrets.DEVELOPER_TEAM }}
           ISSUE_NUMBER: ${{ steps.issue.outputs.issue_number }}
@@ -93,7 +95,7 @@ jobs:
     steps:
       # Safe checkout: base repo only.
       - name: Checkout target repo base
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -101,7 +103,7 @@ jobs:
 
       # Private DevFlow (maf-dashboard) checkout.
       - name: Checkout DevFlow
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.DEVFLOW_REPOSITORY }}
           ref: ${{ env.DEVFLOW_REF }}
@@ -111,12 +113,12 @@ jobs:
           path: devflow
 
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
+        uses: astral-sh/setup-uv@v7
         with:
           version: "0.11.x"
           enable-cache: true
@@ -126,7 +128,7 @@ jobs:
         run: uv sync --frozen
 
       - 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 }}
@@ -137,7 +139,6 @@ jobs:
         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 }}
@@ -150,22 +151,21 @@ jobs:
             --apply-labels
 
       - name: Stop after spam gate
-        if: ${{ steps.spam.outputs.allow_triage != 'true' }}
+        if: ${{ steps.spam.outputs.decision != 'allow' }}
         shell: bash
+        env:
+          SPAM_DECISION: ${{ steps.spam.outputs.decision }}
         run: |
-          echo "Stopping: issue triage preflight did not allow automation."
+          echo "Stopping: spam gate decided: ${SPAM_DECISION}"
           exit 1
 
       - name: Reproduce reported issue
-        if: ${{ steps.spam.outputs.allow_triage == 'true' }}
+        if: ${{ steps.spam.outputs.decision == 'allow' }}
         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 }}

.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
@@ -90,7 +90,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-openai
           path: ./python/pytest.xml
@@ -112,7 +112,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 +123,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 }}
@@ -141,7 +141,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-azure-openai
           path: ./python/pytest.xml
@@ -163,7 +163,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -177,7 +177,7 @@ jobs:
         run: curl -fsSL https://ollama.com/install.sh | sh
         working-directory: .
       - name: Cache Ollama models
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache@v4
         with:
           path: ~/.ollama/models
           key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
@@ -231,7 +231,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-misc
           path: ./python/pytest.xml
@@ -283,7 +283,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 +294,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 }}
@@ -315,7 +315,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-functions
           path: ./python/pytest.xml
@@ -341,7 +341,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 +352,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 }}
@@ -369,7 +369,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-foundry
           path: ./python/pytest.xml
@@ -388,7 +388,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -399,7 +399,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 }}
@@ -416,7 +416,7 @@ jobs:
           --junitxml=pytest.xml
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-foundry-hosting
           path: ./python/pytest.xml
@@ -443,7 +443,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -468,7 +468,7 @@ jobs:
         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
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-cosmos
           path: ./python/pytest.xml
@@ -496,7 +496,7 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.checkout-ref }}
           persist-credentials: false
@@ -506,12 +506,12 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Download all test results from current run
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@v4
         with:
           pattern: test-results-*
           path: test-results/
       - name: Restore report history cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/restore@v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-integration-${{ github.run_id }}
@@ -528,13 +528,13 @@ jobs:
         run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
       - name: Save report history cache
         if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/save@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
+        uses: actions/upload-artifact@v7
         with:
           name: integration-test-report
           path: |
@@ -558,12 +558,12 @@ jobs:
     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

@@ -41,8 +41,8 @@ jobs:
       foundryHostingChanged: ${{ steps.filter.outputs.foundry_hosting }}
       cosmosChanged: ${{ steps.filter.outputs.cosmos }}
     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: |
@@ -106,7 +106,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
@@ -123,7 +123,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
@@ -153,7 +153,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
@@ -177,7 +177,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
@@ -186,7 +186,7 @@ jobs:
           title: OpenAI integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-openai
           path: ./python/pytest.xml
@@ -214,7 +214,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
@@ -223,7 +223,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 }}
@@ -247,7 +247,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
@@ -256,7 +256,7 @@ jobs:
           title: Azure OpenAI integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-azure-openai
           path: ./python/pytest.xml
@@ -284,7 +284,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
@@ -295,7 +295,7 @@ jobs:
         run: curl -fsSL https://ollama.com/install.sh | sh
         working-directory: .
       - name: Cache Ollama models
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache@v4
         with:
           path: ~/.ollama/models
           key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
@@ -370,7 +370,7 @@ 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
@@ -379,7 +379,7 @@ jobs:
           title: Misc integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-misc
           path: ./python/pytest.xml
@@ -417,7 +417,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
@@ -426,7 +426,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 }}
@@ -448,7 +448,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
@@ -457,7 +457,7 @@ jobs:
           title: Functions integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-functions
           path: ./python/pytest.xml
@@ -488,7 +488,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
@@ -497,7 +497,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 }}
@@ -515,7 +515,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
@@ -524,7 +524,7 @@ jobs:
           title: Test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-foundry
           path: ./python/pytest.xml
@@ -549,7 +549,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
@@ -558,7 +558,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 }}
@@ -576,7 +576,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
@@ -585,7 +585,7 @@ jobs:
           title: Foundry Hosting integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-foundry-hosting
           path: ./python/pytest.xml
@@ -620,7 +620,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
@@ -643,7 +643,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
@@ -652,7 +652,7 @@ jobs:
           title: Cosmos integration test results
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@v7
         with:
           name: test-results-cosmos
           path: ./python/pytest.xml
@@ -680,19 +680,19 @@ jobs:
       run:
         working-directory: python
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@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
+        uses: actions/download-artifact@v4
         with:
           pattern: test-results-*
           path: test-results/
       - name: Restore report history cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/restore@v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-merge-${{ github.run_id }}
@@ -709,13 +709,13 @@ jobs:
         run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
       - name: Save report history cache
         if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/save@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
+        uses: actions/upload-artifact@v7
         with:
           name: integration-test-report
           path: |
@@ -740,13 +740,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!')

.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

@@ -19,9 +19,9 @@ 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: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           run-id: ${{ github.event.workflow_run.id }}
@@ -46,7 +46,7 @@ jobs:
           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: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           issue-number: ${{ env.PR_NUMBER }}

.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

@@ -246,5 +246,3 @@ dotnet/filtered-*.slnx
 # Local tool state
 .omc/
 .omx/
-
-**/issues/

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
 

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.

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/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,14 +22,13 @@
     <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.AgentServer.Core" Version="1.0.0-beta.23" />
+    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.3" />
+    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.4" />
+    <PackageVersion Include="Azure.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.Core" Version="1.53.0" />
     <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="DotNetEnv" Version="3.1.1" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
@@ -44,7 +43,7 @@
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.5" />
-    <PackageVersion Include="System.ClientModel" Version="1.12.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.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" />
@@ -72,12 +71,12 @@
     <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" />
@@ -99,7 +98,7 @@
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.67.0-preview" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.0-preview" />
     <!-- Agent SDKs -->
-    <PackageVersion Include="GitHub.Copilot.SDK" Version="1.0.0-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" />
@@ -110,9 +109,6 @@
     <PackageVersion Include="A2A.AspNetCore" Version="1.0.0-preview2" />
     <!-- MCP -->
     <PackageVersion Include="ModelContextProtocol" Version="1.1.0" />
-    <!-- Hyperlight -->
-    <PackageVersion Include="Hyperlight.HyperlightSandbox.Api" Version="0.4.0" />
-    <PackageVersion Include="Hyperlight.HyperlightSandbox.Guest.Python" Version="0.4.0" />
     <!-- Inference SDKs -->
     <PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
@@ -195,4 +191,4 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-</Project>
+</Project>

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

@@ -65,7 +65,6 @@
     <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 +116,13 @@
     <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_Step02_Research_WithSubAgents/Harness_Step02_Research_WithSubAgents.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,8 +167,7 @@
     <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" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step25_ToolboxServerSideTools/Agent_Step25_ToolboxServerSideTools.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/Evaluation/">
     <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
@@ -182,12 +175,6 @@
     <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" />
     <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
@@ -214,7 +201,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,9 +229,9 @@
     <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" />
@@ -283,7 +269,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,7 +289,6 @@
   </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>
@@ -323,30 +307,15 @@
   <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-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>
@@ -354,15 +323,11 @@
     <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/DurableAgents/" />
   <Folder Name="/Samples/04-hosting/DurableAgents/AzureFunctions/">
     <File Path="samples/04-hosting/DurableAgents/AzureFunctions/.editorconfig" />
@@ -392,7 +357,7 @@
     <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>
+  </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" />
@@ -570,16 +535,6 @@
   <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" />
@@ -599,20 +554,15 @@
     <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" />
@@ -626,16 +576,12 @@
     <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
     <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
     <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Foundry.Hosting.IntegrationTests.TestContainer/Foundry.Hosting.IntegrationTests.TestContainer.csproj" />
-    <Project Path="tests/Foundry.Hosting.IntegrationTests/Foundry.Hosting.IntegrationTests.csproj" />
     <Project Path="tests/Foundry.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" />
@@ -652,21 +598,17 @@
     <Project Path="tests/Microsoft.Agents.AI.Declarative.UnitTests/Microsoft.Agents.AI.Declarative.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.DevUI.UnitTests/Microsoft.Agents.AI.DevUI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.DurableTask.UnitTests/Microsoft.Agents.AI.DurableTask.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Foundry.UnitTests/Microsoft.Agents.AI.Foundry.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Harness.UnitTests/Microsoft.Agents.AI.Harness.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.UnitTests/Microsoft.Agents.AI.Hosting.A2A.UnitTests.csproj" />
     <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,7 +7,6 @@
       "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",
@@ -20,23 +19,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/nuget-package.props

@@ -1,14 +1,14 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.8.0</VersionPrefix>
+    <VersionPrefix>1.3.0</VersionPrefix>
     <RCNumber>1</RCNumber>
-    <DateSuffix>260528</DateSuffix>
+    <DateSuffix>260423</DateSuffix>
     <PackageVersion Condition="'$(IsReleaseCandidate)' == 'true'">$(VersionPrefix)-rc$(RCNumber)</PackageVersion>
     <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).$(DateSuffix).1</PackageVersion>
     <PackageVersion Condition="'$(IsReleaseCandidate)' != 'true' AND '$(VersionSuffix)' == ''">$(VersionPrefix)-preview.$(DateSuffix).1</PackageVersion>
     <PackageVersion Condition="'$(IsReleased)' == 'true'">$(VersionPrefix)</PackageVersion>
-    <GitTag>1.8.0</GitTag>
+    <GitTag>1.3.0</GitTag>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>

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/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/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_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/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_Step25_ToolboxServerSideTools/Agent_Step25_ToolboxServerSideTools.csproj

@@ -6,11 +6,12 @@
 
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows\Microsoft.Agents.AI.Workflows.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Foundry.Hosting\Microsoft.Agents.AI.Foundry.Hosting.csproj" />
+    <PackageReference Include="Azure.AI.Projects" VersionOverride="2.1.0-beta.1" />
   </ItemGroup>
 
 </Project>

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

@@ -0,0 +1,148 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+// This sample shows how to load a Foundry toolbox and pass its tools as server-side
+// tools when creating an agent. The Foundry platform handles tool execution — the agent
+// process does not invoke tools locally.
+
+using System.ClientModel;
+using System.ClientModel.Primitives;
+using Azure.AI.Projects;
+using Azure.AI.Projects.Agents;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+using OpenAI.Responses;
+
+#pragma warning disable OPENAI001 // Experimental API
+#pragma warning disable AAIP001  // AgentToolboxes is experimental
+#pragma warning disable CS8321   // Local functions may be commented-out alternatives
+
+// Replace with your own Foundry toolbox name.
+const string ToolboxName = "research_toolbox";
+// Used only by CombineToolboxes — swap in a second toolbox you own.
+const string SecondToolboxName = "analysis_toolbox";
+// Replace with any question that exercises the tools configured in your toolbox.
+const string Query = "Introduce yourself and briefly describe the tools you can use to help me.";
+
+string endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT")
+    ?? throw new InvalidOperationException("Set FOUNDRY_PROJECT_ENDPOINT to your Foundry project endpoint.");
+string model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+
+// 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.
+var projectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());
+
+await Main(projectClient, model, endpoint);
+// await CombineToolboxes(projectClient, model, endpoint);
+
+// ---------------------------------------------------------------------------
+// Main: single toolbox
+// ---------------------------------------------------------------------------
+static async Task Main(AIProjectClient projectClient, string model, string endpoint)
+{
+    Console.WriteLine("=== Foundry Toolbox Server-Side Tools Example ===");
+
+    // Comment out if the toolbox already exists in your Foundry project.
+    await CreateSampleToolboxAsync(ToolboxName, endpoint);
+
+    // Omit the version to resolve the toolbox's current default version at runtime.
+    var tools = await projectClient.GetToolboxToolsAsync(ToolboxName);
+
+    AIAgent agent = projectClient
+        .AsAIAgent(
+            model: model,
+            instructions: "You are a research assistant. Use the available tools to answer questions.",
+            tools: tools.ToList());
+
+    Console.WriteLine($"User: {Query}");
+    Console.WriteLine($"Result: {await agent.RunAsync(Query)}\n");
+}
+
+// ---------------------------------------------------------------------------
+// Alternative: combine tools from multiple toolboxes
+// ---------------------------------------------------------------------------
+static async Task CombineToolboxes(AIProjectClient projectClient, string model, string endpoint)
+{
+    Console.WriteLine("=== Combine Toolboxes Example ===");
+
+    // Comment out if the toolboxes already exist in your Foundry project.
+    await CreateSampleToolboxAsync(ToolboxName, endpoint);
+    await CreateSampleToolboxAsync(SecondToolboxName, endpoint);
+
+    var toolboxA = await projectClient.GetToolboxToolsAsync(ToolboxName);
+    var toolboxB = await projectClient.GetToolboxToolsAsync(SecondToolboxName);
+
+    var allTools = toolboxA.Concat(toolboxB).ToList();
+
+    AIAgent agent = projectClient
+        .AsAIAgent(
+            model: model,
+            instructions: "You are a research assistant. Use all available tools to answer questions.",
+            tools: allTools);
+
+    Console.WriteLine($"User: {Query}");
+    Console.WriteLine($"Combined-toolbox result: {await agent.RunAsync(Query)}\n");
+}
+
+// ---------------------------------------------------------------------------
+// Helper: create (or replace) a sample toolbox so the sample works out-of-the-box
+// ---------------------------------------------------------------------------
+static async Task CreateSampleToolboxAsync(string name, string endpoint)
+{
+    // 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),
+        new DefaultAzureCredential(),
+        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)));
+
+    var 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))");
+}
+
+// ---------------------------------------------------------------------------
+// Pipeline policy that adds the Foundry-Features header for toolbox CRUD
+// ---------------------------------------------------------------------------
+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);
+    }
+}

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

@@ -0,0 +1,46 @@
+# Agent_Step25_ToolboxServerSideTools
+
+This sample demonstrates loading a named Foundry toolbox and passing its tools as
+**server-side tools** when creating an agent via `AsAIAgent()`.
+
+When tools from a toolbox are passed this way, they are sent as tool definitions in
+the Responses API request. The Foundry platform handles tool execution — the agent
+process does not invoke tools locally.
+
+This is the dotnet equivalent of the Python sample:
+`python/samples/02-agents/providers/foundry/foundry_chat_client_with_toolbox.py`
+
+## Prerequisites
+
+- A Microsoft Foundry project
+- `AZURE_AI_PROJECT_ENDPOINT` environment variable set to your Foundry project endpoint
+- `AZURE_AI_MODEL_DEPLOYMENT_NAME` environment variable set (defaults to `gpt-5.4-mini`)
+
+The sample recreates the toolbox on each run, replacing any existing toolbox with
+the same name. Comment out the `CreateSampleToolboxAsync` call if you want to keep
+an existing toolbox unchanged.
+
+## How it works
+
+1. `projectClient.GetToolboxVersionAsync(name)` fetches the toolbox definition from the
+   Foundry project API (resolving the default version if none is specified)
+2. `ToolboxVersion.ToAITools()` converts each tool definition to an `AITool` instance
+3. The tools are passed to `AsAIAgent(tools: ...)` which includes them in the Responses
+   API request as server-side tool definitions
+
+For a one-liner, use `projectClient.GetToolboxToolsAsync(name)` to fetch and convert in one call.
+
+## Sample flows
+
+| Flow | Description |
+|------|-------------|
+| `Main` (default) | Loads a single toolbox and runs an agent with its tools |
+| `CombineToolboxes` | Loads two toolboxes and merges their tools into one agent |
+
+Uncomment the desired flow in the top-level statements to try each one.
+
+## Running the sample
+
+```bash
+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>

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

@@ -1,93 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// Foundry Toolbox MCP Skills.
-//
-// Uses AgentSkillsProviderBuilder to discover MCP-based skills from a Foundry
-// Toolbox endpoint and inject them as AIContextProviders so the agent can
-// discover and use them at runtime.
-
-using System.Net.Http.Headers;
-using Azure.AI.Projects;
-using Azure.Core;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using ModelContextProtocol.Client;
-
-// --- Configuration ---
-string endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT")
-    ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-string toolboxMcpServerUrl = Environment.GetEnvironmentVariable("FOUNDRY_TOOLBOX_MCP_SERVER_URL")
-    ?? throw new InvalidOperationException("FOUNDRY_TOOLBOX_MCP_SERVER_URL is not set.");
-
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
-TokenCredential credential = new DefaultAzureCredential();
-
-using var httpClient = new HttpClient(new BearerTokenHandler(credential, "https://ai.azure.com/.default")
-{
-    InnerHandler = new HttpClientHandler(),
-});
-
-// --- Connect to the Foundry Toolbox MCP endpoint ---
-await using McpClient mcpClient = await McpClient.CreateAsync(
-    new HttpClientTransport(
-        new HttpClientTransportOptions
-        {
-            Endpoint = new Uri(toolboxMcpServerUrl),
-            Name = "foundry_toolbox",
-            TransportMode = HttpTransportMode.StreamableHttp,
-            AdditionalHeaders = new Dictionary<string, string>
-            {
-                ["Foundry-Features"] = "Toolboxes=V1Preview",
-            },
-        },
-        httpClient));
-
-// --- Discover MCP-based skills ---
-var skillsProvider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(mcpClient)
-    .Build();
-
-// --- Create the agent ---
-AIProjectClient aiProjectClient = new(new Uri(endpoint), credential);
-
-AIAgent agent = aiProjectClient.AsAIAgent(
-    options: new ChatClientAgentOptions
-    {
-        Name = "ToolboxMcpSkillsAgent",
-        ChatOptions = new()
-        {
-            ModelId = deploymentName,
-            Instructions = "You are a helpful assistant. Use available skills to answer the user.",
-        },
-        AIContextProviders = [skillsProvider],
-    });
-
-// --- Interactive prompt ---
-Console.Write("User: ");
-string? query = Console.ReadLine();
-
-if (string.IsNullOrWhiteSpace(query))
-{
-    Console.WriteLine("No input provided.");
-    return;
-}
-
-Console.WriteLine($"Assistant: {await agent.RunAsync(query)}");
-
-// ---------------------------------------------------------------------------
-// DelegatingHandler: attaches a fresh Foundry bearer token to every request
-// ---------------------------------------------------------------------------
-internal sealed class BearerTokenHandler(TokenCredential credential, string scope) : DelegatingHandler
-{
-    private readonly TokenRequestContext _tokenContext = new([scope]);
-
-    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-    {
-        AccessToken token = await credential.GetTokenAsync(this._tokenContext, cancellationToken).ConfigureAwait(false);
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token.Token);
-        return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
-    }
-}

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

@@ -1,32 +0,0 @@
-# Foundry Toolbox MCP Skills
-
-This sample uses
-`AgentSkillsProviderBuilder` to discover MCP-based skills from a Foundry Toolbox endpoint
-and inject them as `AIContextProviders` so the agent can discover and use them at runtime.
-
-## What this sample demonstrates
-
-- Connecting to a Foundry toolbox's MCP endpoint via Streamable HTTP transport
-- Injecting a fresh Azure AI bearer token (`https://ai.azure.com/.default`) on every MCP request
-- Using `AgentSkillsProviderBuilder.UseMcpSkills(client)` to discover skills from the toolbox
-- Injecting the discovered skills into `AIProjectClient.AsAIAgent(...)` via `AIContextProviders`
-
-## Prerequisites
-
-- A Microsoft Foundry project with a toolbox already configured
-- The toolbox MCP endpoint must expose `skill://index.json` with `skill-md` entries (SEP-2640). If the resource is absent, the sample runs but the skills provider will be empty.
-- Azure CLI installed and authenticated (`az login`)
-
-Set the following environment variables:
-
-```powershell
-$env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project"
-$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"
-$env:FOUNDRY_TOOLBOX_MCP_SERVER_URL="https://your-foundry-service.services.ai.azure.com/api/projects/your-project/toolboxes/your-toolbox/mcp?api-version=v1"
-```
-
-## Run the sample
-
-```powershell
-dotnet run
-```

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

@@ -73,8 +73,6 @@ Some samples require extra tool-specific environment variables. See each sample
 | [Memory search](./Agent_Step22_MemorySearch/) | Memory search tool |
 | [Local MCP](./Agent_Step23_LocalMCP/) | Local MCP client with HTTP transport |
 | [Code interpreter file download](./Agent_Step24_CodeInterpreterFileDownload/) | Download container files generated by code interpreter |
-| [Foundry toolbox via MCP](./Agent_Step25_FoundryToolboxMcp/) | Use a Foundry Toolbox from a non-hosted agent via its MCP endpoint |
-| [Foundry toolbox MCP skills](./Agent_Step26_FoundryToolboxMcpSkills/) | Use a Foundry Toolbox with MCP-based skills discovery (SEP-2640) via AIContextProviders |
 
 ## Running the samples
 

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/AnsiEscapes.cs

@@ -1,184 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// Provides descriptive helpers for common ANSI/VT100 escape sequences used
-/// in the split-console layout (DECSTBM scroll regions, cursor movement, line erasure).
-/// </summary>
-public static class AnsiEscapes
-{
-    /// <summary>
-    /// Sets the scrollable region to rows 1 through <paramref name="bottom"/> (DECSTBM).
-    /// Content outside this region will not scroll.
-    /// </summary>
-    public static string SetScrollRegion(int bottom) => $"\x1b[1;{bottom}r";
-
-    /// <summary>
-    /// Resets the scroll region to the full terminal height (DECSTBM reset).
-    /// </summary>
-    public static string ResetScrollRegion => "\x1b[r";
-
-    /// <summary>
-    /// Moves the cursor to the specified 1-based <paramref name="row"/> and <paramref name="column"/> (CUP).
-    /// </summary>
-    public static string MoveCursor(int row, int column) => $"\x1b[{row};{column}H";
-
-    /// <summary>
-    /// Erases the current line from the cursor position to the end of the line (EL 0).
-    /// </summary>
-    public static string EraseToEndOfLine => "\x1b[0K";
-
-    /// <summary>
-    /// Erases the entire current line (EL 2).
-    /// </summary>
-    public static string EraseEntireLine => "\x1b[2K";
-
-    /// <summary>
-    /// Erases the entire screen.
-    /// </summary>
-    public static string EraseEntireScreen => "\x1b[2J";
-
-    /// <summary>
-    /// Erases the scrollback buffer (ESC[3J). Use alongside <see cref="EraseEntireScreen"/>
-    /// to fully clear both the visible screen and the scroll history.
-    /// </summary>
-    public static string EraseScrollbackBuffer => "\x1b[3J";
-
-    /// <summary>
-    /// Saves the current cursor position (DECSC / SCP).
-    /// Note: most terminals have a single save slot — nested saves are not supported.
-    /// </summary>
-    public static string SaveCursor => "\x1b[s";
-
-    /// <summary>
-    /// Restores the previously saved cursor position (DECRC / RCP).
-    /// </summary>
-    public static string RestoreCursor => "\x1b[u";
-
-    /// <summary>
-    /// Moves the cursor to the specified 1-based <paramref name="row"/> at column 1, then erases the entire line.
-    /// Convenience combination of <see cref="MoveCursor"/> and <see cref="EraseEntireLine"/>.
-    /// </summary>
-    public static string MoveAndEraseLine(int row) => $"\x1b[{row};1H\x1b[2K";
-
-    /// <summary>
-    /// Sets the foreground text color using a <see cref="ConsoleColor"/> value.
-    /// </summary>
-    public static string SetForegroundColor(ConsoleColor color) => $"\x1b[{ConsoleColorToAnsi(color)}m";
-
-    /// <summary>
-    /// Resets all text attributes (color, bold, etc.) to their defaults.
-    /// </summary>
-    public static string ResetAttributes => "\x1b[0m";
-
-    /// <summary>
-    /// Returns the visible (printed) length of a string after stripping ANSI escape sequences.
-    /// Escape sequences are zero-width on screen but occupy characters in the raw string.
-    /// </summary>
-    /// <remarks>
-    /// This counts UTF-16 code units (chars) rather than terminal display cells. Emoji,
-    /// combining characters, variation selectors, and East Asian wide characters may be
-    /// measured incorrectly. For the console harness this is acceptable since content is
-    /// predominantly ASCII, and emoji are padded with surrounding spaces.
-    /// </remarks>
-    public static int VisibleLength(string text)
-    {
-        if (string.IsNullOrEmpty(text))
-        {
-            return 0;
-        }
-
-        int length = 0;
-        for (int i = 0; i < text.Length; i++)
-        {
-            if (text[i] == '\x1b' && i + 1 < text.Length && text[i + 1] == '[')
-            {
-                // Skip the ESC[ and all characters up to and including the final byte (0x40–0x7E).
-                i += 2;
-                while (i < text.Length && text[i] < 0x40)
-                {
-                    i++;
-                }
-
-                // i now points to the final byte of the escape sequence; the for-loop will advance past it.
-            }
-            else if (text[i] != '\n' && text[i] != '\r')
-            {
-                length++;
-            }
-        }
-
-        return length;
-    }
-
-    /// <summary>
-    /// Counts the number of physical terminal rows a text item will occupy,
-    /// accounting for both explicit newlines and terminal line wrapping.
-    /// </summary>
-    /// <param name="text">The text to measure.</param>
-    /// <param name="terminalWidth">The terminal width in columns. If &lt;= 0, wrapping is ignored (1 row per logical line).</param>
-    /// <returns>The number of physical rows the text occupies.</returns>
-    public static int CountPhysicalLines(string text, int terminalWidth)
-    {
-        if (string.IsNullOrEmpty(text))
-        {
-            return 0;
-        }
-
-        int physicalLines = 0;
-        int lineStart = 0;
-
-        for (int i = 0; i <= text.Length; i++)
-        {
-            if (i == text.Length || text[i] == '\n')
-            {
-                if (terminalWidth <= 0)
-                {
-                    // No wrapping — each logical line is one physical row
-                    physicalLines += 1;
-                }
-                else
-                {
-                    string logicalLine = text[lineStart..i];
-                    int visibleWidth = VisibleLength(logicalLine);
-
-                    physicalLines += visibleWidth == 0
-                        ? 1
-                        : (visibleWidth - 1) / terminalWidth + 1;
-                }
-
-                lineStart = i + 1;
-            }
-        }
-
-        // If text ends with a newline, don't count the trailing empty line
-        if (text[text.Length - 1] == '\n')
-        {
-            physicalLines--;
-        }
-
-        return physicalLines;
-    }
-
-    private static int ConsoleColorToAnsi(ConsoleColor color) => color switch
-    {
-        ConsoleColor.Black => 30,
-        ConsoleColor.DarkRed => 31,
-        ConsoleColor.DarkGreen => 32,
-        ConsoleColor.DarkYellow => 33,
-        ConsoleColor.DarkBlue => 34,
-        ConsoleColor.DarkMagenta => 35,
-        ConsoleColor.DarkCyan => 36,
-        ConsoleColor.Gray => 37,
-        ConsoleColor.DarkGray => 90,
-        ConsoleColor.Red => 91,
-        ConsoleColor.Green => 92,
-        ConsoleColor.Yellow => 93,
-        ConsoleColor.Blue => 94,
-        ConsoleColor.Magenta => 95,
-        ConsoleColor.Cyan => 96,
-        ConsoleColor.White => 97,
-        _ => 37
-    };
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/ConsoleReactiveComponents.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../ConsoleReactiveFramework/ConsoleReactiveFramework.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/ListSelection.cs

@@ -1,153 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// A component that renders a selectable list of items with a cursor indicator.
-/// The selected item is indicated with a "&gt;" prefix and rendered in the highlight color.
-/// Optionally includes a title above the list and a custom text input option at the bottom.
-/// </summary>
-public class ListSelection : ConsoleReactiveComponent<ListSelectionProps, ConsoleReactiveState>
-{
-    /// <summary>
-    /// Calculates the height (in rows) required to render the list,
-    /// including the optional title and custom text input row.
-    /// </summary>
-    /// <param name="props">The list selection props.</param>
-    /// <returns>The number of rows needed.</returns>
-    public static int CalculateHeight(ListSelectionProps props)
-    {
-        int height = props.Items.Count;
-        if (props.CustomTextPlaceholder != null)
-        {
-            height++;
-        }
-
-        height += GetTitleLineCount(props.Title);
-        return height;
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(ListSelectionProps props, ConsoleReactiveState state)
-    {
-        int row = 0;
-
-        // Render the title lines (if any)
-        if (props.Title is not null)
-        {
-            foreach (string line in props.Title.Split('\n'))
-            {
-                Console.Write(AnsiEscapes.MoveCursor(props.Y + row, props.X));
-                Console.Write(line);
-                Console.Write(AnsiEscapes.EraseToEndOfLine);
-                row++;
-            }
-        }
-
-        // Render the list items + optional custom text row
-        int totalItems = props.Items.Count + (props.CustomTextPlaceholder != null ? 1 : 0);
-
-        for (int i = 0; i < totalItems; i++)
-        {
-            Console.Write(AnsiEscapes.MoveCursor(props.Y + row, props.X));
-
-            bool isSelected = i == props.SelectedIndex;
-            bool isCustomTextOption = props.CustomTextPlaceholder != null && i == props.Items.Count;
-
-            // Cursor indicator
-            Console.Write(isSelected ? "> " : "  ");
-
-            if (isCustomTextOption)
-            {
-                this.RenderCustomTextOption(props, isSelected);
-            }
-            else
-            {
-                if (isSelected)
-                {
-                    Console.Write(AnsiEscapes.SetForegroundColor(props.HighlightColor));
-                }
-
-                Console.Write(props.Items[i]);
-                Console.Write(AnsiEscapes.EraseToEndOfLine);
-
-                if (isSelected)
-                {
-                    Console.Write(AnsiEscapes.ResetAttributes);
-                }
-            }
-
-            Console.WriteLine();
-            row++;
-        }
-    }
-
-    /// <summary>
-    /// Gets the number of lines the title occupies, or 0 if no title is set.
-    /// </summary>
-    private static int GetTitleLineCount(string? title) =>
-        title is null ? 0 : title.Split('\n').Length;
-
-    private void RenderCustomTextOption(ListSelectionProps props, bool isSelected)
-    {
-        if (props.CustomText.Length > 0)
-        {
-            // User has typed text — render in highlight color if selected
-            if (isSelected)
-            {
-                Console.Write(AnsiEscapes.SetForegroundColor(props.HighlightColor));
-            }
-
-            Console.Write(props.CustomText);
-            Console.Write(AnsiEscapes.EraseToEndOfLine);
-
-            if (isSelected)
-            {
-                Console.Write(AnsiEscapes.ResetAttributes);
-            }
-        }
-        else if (!string.IsNullOrWhiteSpace(props.CustomTextPlaceholder))
-        {
-            // No text — show placeholder in dark grey (or highlight color if selected)
-            if (isSelected)
-            {
-                Console.Write(AnsiEscapes.SetForegroundColor(props.HighlightColor));
-            }
-            else
-            {
-                Console.Write(AnsiEscapes.SetForegroundColor(ConsoleColor.DarkGray));
-            }
-
-            Console.Write(" ");
-            Console.Write(props.CustomTextPlaceholder);
-            Console.Write(AnsiEscapes.EraseToEndOfLine);
-            Console.Write(AnsiEscapes.ResetAttributes);
-        }
-    }
-}
-
-/// <summary>
-/// Props for <see cref="ListSelection"/>.
-/// </summary>
-public record ListSelectionProps : ConsoleReactiveProps
-{
-    /// <summary>Gets the title text displayed above the list items. May contain newlines for multi-line titles.</summary>
-    public string? Title { get; init; }
-
-    /// <summary>Gets the items to display in the list.</summary>
-    public IReadOnlyList<string> Items { get; init; } = Array.Empty<string>();
-
-    /// <summary>Gets the zero-based index of the currently selected item.</summary>
-    public int SelectedIndex { get; init; }
-
-    /// <summary>Gets the highlight color for the active item. Defaults to <see cref="ConsoleColor.Cyan"/>.</summary>
-    public ConsoleColor HighlightColor { get; init; } = ConsoleColor.Cyan;
-
-    /// <summary>Gets the placeholder text for the custom text input option. If <c>null</c>, no custom option is shown.</summary>
-    public string? CustomTextPlaceholder { get; init; }
-
-    /// <summary>Gets the text being typed into the custom text input option.</summary>
-    public string CustomText { get; init; } = "";
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/TextInput.cs

@@ -1,101 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// Props for <see cref="TextInput"/>.
-/// </summary>
-public record TextInputProps : ConsoleReactiveProps
-{
-    /// <summary>Gets the prompt string displayed on the left (e.g. "&gt; " or "user &gt; ").</summary>
-    public string Prompt { get; init; } = "> ";
-
-    /// <summary>Gets the text content to render to the right of the prompt.</summary>
-    public string Text { get; init; } = "";
-
-    /// <summary>Gets the placeholder text shown in dark grey when <see cref="Text"/> is empty.</summary>
-    public string Placeholder { get; init; } = "";
-}
-
-/// <summary>
-/// A component that renders a prompt with text input. Supports multi-line text
-/// where continuation lines are indented to align with the text start position
-/// (i.e. the column after the prompt).
-/// </summary>
-public class TextInput : ConsoleReactiveComponent<TextInputProps, ConsoleReactiveState>
-{
-    /// <summary>
-    /// Calculates the height (in rows) required to render the prompt and text
-    /// given the available width.
-    /// </summary>
-    /// <param name="props">The text input props.</param>
-    /// <param name="availableWidth">The total available width in columns.</param>
-    /// <returns>The number of rows needed.</returns>
-    public static int CalculateHeight(TextInputProps props, int availableWidth)
-    {
-        int promptLength = props.Prompt.Length;
-        int textWidth = availableWidth - promptLength;
-
-        if (textWidth <= 0 || props.Text.Length == 0)
-        {
-            return 1;
-        }
-
-        int lines = 1;
-        int remaining = props.Text.Length - textWidth;
-        while (remaining > 0)
-        {
-            lines++;
-            remaining -= textWidth;
-        }
-
-        return lines;
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(TextInputProps props, ConsoleReactiveState state)
-    {
-        int promptLength = props.Prompt.Length;
-        int textWidth = props.Width - promptLength;
-        string indent = new(' ', promptLength);
-
-        // First line: prompt + start of text
-        Console.Write(AnsiEscapes.MoveCursor(props.Y, props.X));
-        Console.Write(AnsiEscapes.EraseEntireLine);
-        Console.Write(props.Prompt);
-
-        if (textWidth <= 0 || props.Text.Length == 0)
-        {
-            // Show placeholder if text is empty
-            if (props.Text.Length == 0 && props.Placeholder.Length > 0 && textWidth > 0)
-            {
-                Console.Write(AnsiEscapes.SetForegroundColor(ConsoleColor.DarkGray));
-                Console.Write(" ");
-                Console.Write(props.Placeholder[..Math.Min(props.Placeholder.Length, textWidth - 1)]);
-                Console.Write(AnsiEscapes.ResetAttributes);
-            }
-
-            return;
-        }
-
-        int offset = 0;
-        int firstChunk = Math.Min(textWidth, props.Text.Length);
-        Console.Write(props.Text[offset..firstChunk]);
-        offset = firstChunk;
-
-        // Continuation lines: indented to align with text start
-        int row = 1;
-        while (offset < props.Text.Length)
-        {
-            int chunk = Math.Min(textWidth, props.Text.Length - offset);
-            Console.Write(AnsiEscapes.MoveCursor(props.Y + row, props.X));
-            Console.Write(AnsiEscapes.EraseEntireLine);
-            Console.Write(indent);
-            Console.Write(props.Text[offset..(offset + chunk)]);
-            offset += chunk;
-            row++;
-        }
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/TextPanel.cs

@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// Props for <see cref="TextPanel"/>.
-/// </summary>
-public record TextPanelProps : ConsoleReactiveProps
-{
-    /// <summary>Gets the items to render in the panel. Each item is a pre-rendered
-    /// console string (may include ANSI escape sequences and newlines).</summary>
-    public IReadOnlyList<string> Items { get; init; } = [];
-}
-
-/// <summary>
-/// A component that renders a list of pre-rendered string items vertically.
-/// Designed for rendering dynamic items in a non-scroll region that may be
-/// re-rendered on each update. If the component's <see cref="ConsoleReactiveProps.Height"/>
-/// exceeds the number of output lines, leftover lines are erased.
-/// </summary>
-public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiveState>
-{
-    /// <summary>
-    /// Calculates the height (in lines) needed to render all items,
-    /// accounting for terminal line wrapping at the specified width.
-    /// </summary>
-    /// <param name="items">The items to measure.</param>
-    /// <param name="terminalWidth">The terminal width in columns. When 0 or negative, wrapping is ignored.</param>
-    /// <returns>The total number of physical lines all items will occupy.</returns>
-    public static int CalculateHeight(IReadOnlyList<string> items, int terminalWidth = 0)
-    {
-        int total = 0;
-        for (int i = 0; i < items.Count; i++)
-        {
-            total += AnsiEscapes.CountPhysicalLines(items[i], terminalWidth);
-        }
-
-        return total;
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(TextPanelProps props, ConsoleReactiveState state)
-    {
-        int currentRow = 0;
-
-        for (int i = 0; i < props.Items.Count; i++)
-        {
-            string text = props.Items[i];
-            string[] lines = text.Split('\n');
-            int itemLineCount = AnsiEscapes.CountPhysicalLines(text, props.Width);
-            int itemRow = 0;
-
-            for (int j = 0; j < lines.Length && itemRow < itemLineCount; j++)
-            {
-                int linePhysicalRows = props.Width > 0
-                    ? Math.Max(1, (AnsiEscapes.VisibleLength(lines[j]) - 1) / props.Width + 1)
-                    : 1;
-
-                Console.Write(AnsiEscapes.MoveAndEraseLine(props.Y + currentRow));
-                Console.Write(lines[j]);
-
-                currentRow += linePhysicalRows;
-                itemRow += linePhysicalRows;
-            }
-        }
-
-        // If the component height exceeds the output, erase leftover lines
-        if (props.Height > currentRow)
-        {
-            for (int i = currentRow; i < props.Height; i++)
-            {
-                Console.Write(AnsiEscapes.MoveAndEraseLine(props.Y + i));
-            }
-        }
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/TextScrollPanel.cs

@@ -1,88 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// Props for <see cref="TextScrollPanel"/>.
-/// </summary>
-public record TextScrollPanelProps : ConsoleReactiveProps
-{
-    /// <summary>Gets the items to render in the scroll panel. Each item is a pre-rendered
-    /// console string (may include ANSI escape sequences and newlines).</summary>
-    public IReadOnlyList<string> Items { get; init; } = [];
-}
-
-/// <summary>
-/// State for <see cref="TextScrollPanel"/>.
-/// </summary>
-public record TextScrollPanelState : ConsoleReactiveState;
-
-/// <summary>
-/// A component that renders pre-rendered string items within a scroll area.
-/// The last rendered item is considered dynamic and will be re-rendered on each call.
-/// All prior items are considered finalized and are not re-rendered.
-/// Use <see cref="Invalidate"/> to force a full re-render.
-/// </summary>
-public class TextScrollPanel : ConsoleReactiveComponent<TextScrollPanelProps, TextScrollPanelState>
-{
-    private int _renderedCount;
-    private int _lastItemOffsetFromBottom;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="TextScrollPanel"/> class.
-    /// </summary>
-    public TextScrollPanel()
-    {
-        this.State = new TextScrollPanelState();
-    }
-
-    /// <inheritdoc />
-    public override void Invalidate()
-    {
-        this._renderedCount = 0;
-        this._lastItemOffsetFromBottom = 0;
-        base.Invalidate();
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(TextScrollPanelProps props, TextScrollPanelState state)
-    {
-        if (props.Items.Count == 0)
-        {
-            return;
-        }
-
-        int bottomRow = props.Y + props.Height - 1;
-
-        // Determine the first item to render. If we previously rendered items,
-        // re-render the last one (it may have changed/grown) from its stored position.
-        int startIndex = this._renderedCount > 0 ? this._renderedCount - 1 : 0;
-
-        if (this._renderedCount > 0 && this._lastItemOffsetFromBottom > 0)
-        {
-            // Reposition cursor to where the last rendered item began
-            Console.Write(AnsiEscapes.MoveCursor(bottomRow - this._lastItemOffsetFromBottom, props.X));
-        }
-        else
-        {
-            // First render — position at the bottom of the scroll area
-            Console.Write(AnsiEscapes.MoveCursor(bottomRow, props.X));
-        }
-
-        // Render from startIndex onwards
-        for (int i = startIndex; i < props.Items.Count; i++)
-        {
-            Console.Write(props.Items[i]);
-        }
-
-        // Calculate the offset from bottom for the start of the new last item,
-        // accounting for terminal line wrapping at the available width.
-        int lastItemLines = AnsiEscapes.CountPhysicalLines(props.Items[^1], props.Width);
-        this._lastItemOffsetFromBottom = lastItemLines > 0 ? lastItemLines - 1 : 0;
-
-        // Update rendered count
-        this._renderedCount = props.Items.Count;
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveComponents/TopBottomRule.cs

@@ -1,83 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.ConsoleReactiveComponents;
-
-/// <summary>
-/// Props for <see cref="TopBottomRule"/>.
-/// </summary>
-public record TopBottomRuleProps : ConsoleReactiveProps
-{
-    /// <summary>Gets the foreground color of the horizontal rules. If <c>null</c>, the default terminal color is used.</summary>
-    public ConsoleColor? Color { get; init; }
-}
-
-/// <summary>
-/// A component that renders a top and bottom horizontal rule (─) with children
-/// stacked vertically between them.
-/// </summary>
-public class TopBottomRule : ConsoleReactiveComponent<TopBottomRuleProps, ConsoleReactiveState>
-{
-    /// <summary>
-    /// Calculates the total height including the top rule, children, and bottom rule.
-    /// </summary>
-    /// <param name="props">The component props containing children.</param>
-    /// <returns>2 (for the rules) plus the sum of all children heights.</returns>
-    public static int CalculateHeight(TopBottomRuleProps props)
-    {
-        int childrenHeight = 0;
-        foreach (var child in props.Children)
-        {
-            childrenHeight += child.BaseProps?.Height ?? 0;
-        }
-
-        // Top rule + children + bottom rule
-        return 2 + childrenHeight;
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(TopBottomRuleProps props, ConsoleReactiveState state)
-    {
-        int ruleWidth = props.Width;
-        string rule = new('─', ruleWidth);
-
-        if (props.Color.HasValue)
-        {
-            Console.Write(AnsiEscapes.SetForegroundColor(props.Color.Value));
-        }
-
-        // Top rule
-        Console.Write(AnsiEscapes.MoveCursor(props.Y, props.X));
-        Console.Write(rule);
-
-        // Render children stacked below the top rule
-        int currentY = props.Y + 1;
-
-        if (props.Color.HasValue)
-        {
-            Console.Write(AnsiEscapes.ResetAttributes);
-        }
-
-        foreach (var child in props.Children)
-        {
-            child.BaseProps = child.BaseProps! with { X = props.X, Y = currentY };
-            child.Render();
-            currentY += child.BaseProps.Height;
-        }
-
-        if (props.Color.HasValue)
-        {
-            Console.Write(AnsiEscapes.SetForegroundColor(props.Color.Value));
-        }
-
-        // Bottom rule
-        Console.Write(AnsiEscapes.MoveCursor(currentY, props.X));
-        Console.Write(rule);
-
-        if (props.Color.HasValue)
-        {
-            Console.Write(AnsiEscapes.ResetAttributes);
-        }
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveComponent.cs

@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveFramework;
-
-/// <summary>
-/// Abstract base class for all console UI components. Provides access to layout
-/// through <see cref="BaseProps"/> and a <see cref="Render"/> method for drawing to the console.
-/// Derive from <see cref="ConsoleReactiveComponent{TProps, TState}"/> instead of this class directly.
-/// </summary>
-public abstract class ConsoleReactiveComponent
-{
-    internal ConsoleReactiveComponent()
-    {
-    }
-
-    /// <summary>
-    /// Gets the shared render lock across all component types to prevent ANSI escape sequence interleaving.
-    /// </summary>
-    protected static object RenderLock { get; } = new();
-
-    /// <summary>
-    /// Gets or sets the component's props as the base <see cref="ConsoleReactiveProps"/> type.
-    /// Used by parent components to set layout (X, Y, Width, Height) on children without
-    /// knowing the concrete props type.
-    /// </summary>
-    public abstract ConsoleReactiveProps? BaseProps { get; set; }
-
-    /// <summary>Renders the component to the console at its current position.</summary>
-    public abstract void Render();
-
-    /// <summary>
-    /// Invalidates the component's cached render state, causing the next <see cref="Render"/> call
-    /// to proceed even if props and state have not changed. Use after a screen erase to force repaint.
-    /// </summary>
-    public abstract void Invalidate();
-}
-
-/// <summary>
-/// Generic base class for console UI components with typed props and state.
-/// Props represent externally supplied configuration; state represents internal mutable data.
-/// </summary>
-/// <typeparam name="TProps">The type of the component's props (external configuration).</typeparam>
-/// <typeparam name="TState">The type of the component's internal state.</typeparam>
-public abstract class ConsoleReactiveComponent<TProps, TState> : ConsoleReactiveComponent
-    where TProps : ConsoleReactiveProps
-    where TState : ConsoleReactiveState
-{
-    private TProps? _lastRenderedProps;
-    private TState? _lastRenderedState;
-
-    /// <summary>Gets or sets the component's props (external configuration).</summary>
-    public TProps? Props { get; set; }
-
-    /// <inheritdoc/>
-    public override ConsoleReactiveProps? BaseProps
-    {
-        get => this.Props;
-        set => this.Props = (TProps?)value;
-    }
-
-    /// <summary>Gets or sets the component's internal state.</summary>
-    protected TState? State { get; set; }
-
-    /// <summary>
-    /// Updates the component's state and triggers a re-render.
-    /// </summary>
-    /// <param name="newState">The new state value.</param>
-    public void SetState(TState newState)
-    {
-        this.State = newState;
-        this.Render();
-    }
-
-    /// <summary>
-    /// Renders the component using the current props and state.
-    /// Uses a lock to prevent concurrent renders from multiple sources.
-    /// Skips rendering if neither props nor state have changed since the last render.
-    /// </summary>
-    public override void Render()
-    {
-        lock (RenderLock)
-        {
-            if (this.Props is null)
-            {
-                return;
-            }
-
-            if (EqualityComparer<TProps>.Default.Equals(this.Props, this._lastRenderedProps)
-                && EqualityComparer<TState>.Default.Equals(this.State, this._lastRenderedState))
-            {
-                return;
-            }
-
-            this.RenderCore(this.Props, this.State!);
-
-            this._lastRenderedProps = this.Props;
-            this._lastRenderedState = this.State;
-        }
-    }
-
-    /// <inheritdoc/>
-    public override void Invalidate()
-    {
-        lock (RenderLock)
-        {
-            this._lastRenderedProps = default;
-            this._lastRenderedState = default;
-        }
-    }
-
-    /// <summary>
-    /// Called by <see cref="Render"/> to perform the actual rendering. Override this in derived classes.
-    /// </summary>
-    /// <param name="props">The current props.</param>
-    /// <param name="state">The current state.</param>
-    public abstract void RenderCore(TProps props, TState state);
-}
-
-/// <summary>
-/// Base record for component props. Provides layout properties (position and size)
-/// and an optional <see cref="Children"/> collection for composing child components.
-/// </summary>
-public record ConsoleReactiveProps
-{
-    /// <summary>Gets the 1-based column position of the component.</summary>
-    public int X { get; init; }
-
-    /// <summary>Gets the 1-based row position of the component.</summary>
-    public int Y { get; init; }
-
-    /// <summary>Gets the width of the component in columns.</summary>
-    public int Width { get; init; }
-
-    /// <summary>Gets the height of the component in rows.</summary>
-    public int Height { get; init; }
-
-    /// <summary>Gets the child components to render within this component.</summary>
-    public IReadOnlyList<ConsoleReactiveComponent> Children { get; init; } = [];
-}
-
-/// <summary>
-/// Base record for component state.
-/// </summary>
-public record ConsoleReactiveState;

dotnet/samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveFramework.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-</Project>

dotnet/samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveMemo.cs

@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveFramework;
-
-/// <summary>
-/// Caches the result of a mapping function and only recomputes when the input changes.
-/// </summary>
-/// <typeparam name="TInput">The type of the input value.</typeparam>
-/// <typeparam name="TOutput">The type of the mapped output value.</typeparam>
-public class ConsoleReactiveMemo<TInput, TOutput>
-{
-    private TInput? _previousInput;
-    private TOutput? _cachedOutput;
-    private bool _hasValue;
-
-    /// <summary>
-    /// Returns the cached output if <paramref name="input"/> equals the previously stored input;
-    /// otherwise invokes <paramref name="mapper"/> to compute and cache a new output.
-    /// </summary>
-    /// <param name="input">The current input value.</param>
-    /// <param name="mapper">A function that maps the input to an output value.</param>
-    /// <returns>The cached or newly computed output.</returns>
-    public TOutput Map(TInput input, Func<TInput, TOutput> mapper)
-    {
-        ArgumentNullException.ThrowIfNull(mapper);
-
-        if (!this._hasValue || !EqualityComparer<TInput>.Default.Equals(input, this._previousInput))
-        {
-            this._previousInput = input;
-            this._cachedOutput = mapper(input);
-            this._hasValue = true;
-        }
-
-        return this._cachedOutput!;
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleResizeListener.cs

@@ -1,83 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveFramework;
-
-/// <summary>
-/// Event args for console resize events, containing the old and new dimensions.
-/// </summary>
-public class ConsoleResizeEventArgs : EventArgs
-{
-    /// <summary>Gets the previous console width.</summary>
-    public int OldWidth { get; }
-
-    /// <summary>Gets the previous console height.</summary>
-    public int OldHeight { get; }
-
-    /// <summary>Gets the new console width.</summary>
-    public int NewWidth { get; }
-
-    /// <summary>Gets the new console height.</summary>
-    public int NewHeight { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ConsoleResizeEventArgs"/> class.
-    /// </summary>
-    /// <param name="oldWidth">The previous width.</param>
-    /// <param name="oldHeight">The previous height.</param>
-    /// <param name="newWidth">The new width.</param>
-    /// <param name="newHeight">The new height.</param>
-    public ConsoleResizeEventArgs(int oldWidth, int oldHeight, int newWidth, int newHeight)
-    {
-        this.OldWidth = oldWidth;
-        this.OldHeight = oldHeight;
-        this.NewWidth = newWidth;
-        this.NewHeight = newHeight;
-    }
-}
-
-/// <summary>
-/// Singleton that polls console dimensions every 16ms and raises the
-/// <see cref="ConsoleResized"/> event when the window size changes.
-/// </summary>
-public sealed class ConsoleResizeListener
-{
-#pragma warning disable IDE0052 // Remove unread private members
-    private readonly Task _task;
-#pragma warning restore IDE0052 // Remove unread private members
-
-    private int _lastWidth;
-    private int _lastHeight;
-
-    private ConsoleResizeListener()
-    {
-        this._lastWidth = Console.WindowWidth;
-        this._lastHeight = Console.WindowHeight;
-        this._task = this.ListenForResizeAsync();
-    }
-
-    /// <summary>Gets the singleton instance of <see cref="ConsoleResizeListener"/>.</summary>
-    public static ConsoleResizeListener Instance { get; } = new ConsoleResizeListener();
-
-    /// <summary>Raised when the console window is resized.</summary>
-    public event EventHandler<ConsoleResizeEventArgs>? ConsoleResized;
-
-    private async Task ListenForResizeAsync()
-    {
-        while (true)
-        {
-            int currentWidth = Console.WindowWidth;
-            int currentHeight = Console.WindowHeight;
-
-            if (currentWidth != this._lastWidth || currentHeight != this._lastHeight)
-            {
-                int oldWidth = this._lastWidth;
-                int oldHeight = this._lastHeight;
-                this._lastWidth = currentWidth;
-                this._lastHeight = currentHeight;
-                this.ConsoleResized?.Invoke(this, new ConsoleResizeEventArgs(oldWidth, oldHeight, currentWidth, currentHeight));
-            }
-
-            await Task.Delay(16);
-        }
-    }
-}

dotnet/samples/02-agents/Harness/ConsoleReactiveFramework/KeyEventListener.cs

@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Harness.ConsoleReactiveFramework;
-
-/// <summary>
-/// Event args for key press events, wrapping a <see cref="ConsoleKeyInfo"/>.
-/// </summary>
-public class KeyPressEventArgs : EventArgs
-{
-    /// <summary>Gets the key information for the pressed key.</summary>
-    public ConsoleKeyInfo KeyInfo { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="KeyPressEventArgs"/> class.
-    /// </summary>
-    /// <param name="keyInfo">The key information.</param>
-    public KeyPressEventArgs(ConsoleKeyInfo keyInfo)
-    {
-        this.KeyInfo = keyInfo;
-    }
-}
-
-/// <summary>
-/// Singleton that polls for console key presses every 16ms and raises the
-/// <see cref="KeyPressed"/> event when a key is detected.
-/// </summary>
-public sealed class KeyEventListener
-{
-#pragma warning disable IDE0052 // Remove unread private members
-    private readonly Task _task;
-#pragma warning restore IDE0052 // Remove unread private members
-
-    private KeyEventListener()
-    {
-        this._task = this.ListenForKeyPressesAsync();
-    }
-
-    /// <summary>Gets the singleton instance of <see cref="KeyEventListener"/>.</summary>
-    public static KeyEventListener Instance { get; } = new KeyEventListener();
-
-    /// <summary>Raised when a key is pressed in the console.</summary>
-    public event EventHandler<KeyPressEventArgs>? KeyPressed;
-
-    private async Task ListenForKeyPressesAsync()
-    {
-        while (true)
-        {
-            while (Console.KeyAvailable)
-            {
-                var keyInfo = Console.ReadKey(intercept: true);
-                this.KeyPressed?.Invoke(this, new KeyPressEventArgs(keyInfo));
-            }
-
-            await Task.Delay(16);
-        }
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Commands/ExitCommandHandler.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Microsoft.Agents.AI;
-
-namespace Harness.Shared.Console.Commands;
-
-/// <summary>
-/// Handles the <c>/exit</c> command to shut down the console application.
-/// </summary>
-public sealed class ExitCommandHandler : CommandHandler
-{
-    /// <inheritdoc/>
-    public override string? GetHelpText() => "/exit (quit)";
-
-    /// <inheritdoc/>
-    public override ValueTask<bool> TryHandleAsync(string input, AgentSession session, IUXStateDriver ux)
-    {
-        if (!input.Equals("/exit", StringComparison.OrdinalIgnoreCase))
-        {
-            return new ValueTask<bool>(false);
-        }
-
-        ux.RequestShutdown();
-        return new ValueTask<bool>(true);
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Commands/ICommandHandler.cs

@@ -5,25 +5,24 @@ using Microsoft.Agents.AI;
 namespace Harness.Shared.Console.Commands;
 
 /// <summary>
-/// Base class for console command handlers (e.g., /todos, /mode). Command handlers
-/// are checked in order before user input is sent to the agent. The first handler
-/// that accepts the input prevents further handlers from being checked.
+/// Handles a console command (e.g., /todos, /mode). Command handlers are checked
+/// in order before user input is sent to the agent. The first handler that
+/// accepts the input prevents further handlers from being checked.
 /// </summary>
-public abstract class CommandHandler
+public interface ICommandHandler
 {
     /// <summary>
-    /// Gets the help text for this command, displayed in the mode-and-help bar.
+    /// Gets the help text for this command, displayed in the console header.
     /// Returns <see langword="null"/> if the command is not currently available.
     /// </summary>
     /// <returns>Help text like <c>"/todos (show todo list)"</c>, or <see langword="null"/>.</returns>
-    public abstract string? GetHelpText();
+    string? GetHelpText();
 
     /// <summary>
     /// Attempts to handle the given user input.
     /// </summary>
     /// <param name="input">The raw user input string.</param>
     /// <param name="session">The current agent session.</param>
-    /// <param name="ux">The UX state driver for rendering output.</param>
     /// <returns><see langword="true"/> if this handler handled the input; <see langword="false"/> otherwise.</returns>
-    public abstract ValueTask<bool> TryHandleAsync(string input, AgentSession session, IUXStateDriver ux);
+    bool TryHandle(string input, AgentSession session);
 }

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Commands/ModeCommandHandler.cs

@@ -7,7 +7,7 @@ namespace Harness.Shared.Console.Commands;
 /// <summary>
 /// Handles the <c>/mode</c> command to display or switch the current agent mode.
 /// </summary>
-public sealed class ModeCommandHandler : CommandHandler
+internal sealed class ModeCommandHandler : ICommandHandler
 {
     private readonly AgentModeProvider? _modeProvider;
     private readonly IReadOnlyDictionary<string, ConsoleColor>? _modeColors;
@@ -24,10 +24,10 @@ public sealed class ModeCommandHandler : CommandHandler
     }
 
     /// <inheritdoc/>
-    public override string? GetHelpText() => this._modeProvider is not null ? "/mode [plan|execute] (show or switch mode)" : null;
+    public string? GetHelpText() => this._modeProvider is not null ? "/mode [plan|execute] (show or switch mode)" : null;
 
     /// <inheritdoc/>
-    public override async ValueTask<bool> TryHandleAsync(string input, AgentSession session, IUXStateDriver ux)
+    public bool TryHandle(string input, AgentSession session)
     {
         if (!input.StartsWith("/mode ", StringComparison.OrdinalIgnoreCase) && !input.Equals("/mode", StringComparison.OrdinalIgnoreCase))
         {
@@ -36,7 +36,7 @@ public sealed class ModeCommandHandler : CommandHandler
 
         if (this._modeProvider is null)
         {
-            await ux.WriteInfoLineAsync("AgentModeProvider is not available.").ConfigureAwait(false);
+            System.Console.WriteLine("AgentModeProvider is not available.");
             return true;
         }
 
@@ -44,7 +44,7 @@ public sealed class ModeCommandHandler : CommandHandler
         if (parts.Length < 2)
         {
             string current = this._modeProvider.GetMode(session);
-            await ux.WriteInfoLineAsync($"Current mode: {current}").ConfigureAwait(false);
+            System.Console.WriteLine($"\n  Current mode: {current}\n");
             return true;
         }
 
@@ -53,12 +53,15 @@ public sealed class ModeCommandHandler : CommandHandler
         try
         {
             this._modeProvider.SetMode(session, newMode);
-            ux.CurrentMode = newMode;
-            await ux.WriteInfoLineAsync($"Switched to {newMode} mode.", ModeColors.Get(newMode, this._modeColors)).ConfigureAwait(false);
+            System.Console.ForegroundColor = ConsoleWriter.GetModeColor(newMode, this._modeColors);
+            System.Console.WriteLine($"\n  Switched to {newMode} mode.\n");
+            System.Console.ResetColor();
         }
         catch (ArgumentException ex)
         {
-            await ux.WriteInfoLineAsync(ex.Message, ConsoleColor.Red).ConfigureAwait(false);
+            System.Console.ForegroundColor = ConsoleColor.Red;
+            System.Console.WriteLine($"\n  {ex}\n");
+            System.Console.ResetColor();
         }
 
         return true;

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Commands/SessionCommandHandler.cs

@@ -1,98 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json;
-using Microsoft.Agents.AI;
-
-namespace Harness.Shared.Console.Commands;
-
-/// <summary>
-/// Handles <c>/session-export &lt;filename&gt;</c> and <c>/session-import &lt;filename&gt;</c>
-/// commands for serializing the current session to a file and restoring a session from a file.
-/// </summary>
-public sealed class SessionCommandHandler : CommandHandler
-{
-    private readonly AIAgent _agent;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SessionCommandHandler"/> class.
-    /// </summary>
-    /// <param name="agent">The agent used for session serialization and deserialization.</param>
-    public SessionCommandHandler(AIAgent agent)
-    {
-        this._agent = agent;
-    }
-
-    /// <inheritdoc/>
-    public override string? GetHelpText() => "/session-export <file> | /session-import <file>";
-
-    /// <inheritdoc/>
-    public override async ValueTask<bool> TryHandleAsync(string input, AgentSession session, IUXStateDriver ux)
-    {
-        string command = input.Split(' ', 2)[0];
-
-        if (command.Equals("/session-export", StringComparison.OrdinalIgnoreCase))
-        {
-            await this.HandleExportAsync(input, session, ux).ConfigureAwait(false);
-            return true;
-        }
-
-        if (command.Equals("/session-import", StringComparison.OrdinalIgnoreCase))
-        {
-            await this.HandleImportAsync(input, ux).ConfigureAwait(false);
-            return true;
-        }
-
-        return false;
-    }
-
-    private async Task HandleExportAsync(string input, AgentSession session, IUXStateDriver ux)
-    {
-        string[] parts = input.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (parts.Length < 2)
-        {
-            await ux.WriteInfoLineAsync("Usage: /session-export <filename>").ConfigureAwait(false);
-            return;
-        }
-
-        string filename = parts[1];
-        try
-        {
-            JsonElement serialized = await this._agent.SerializeSessionAsync(session).ConfigureAwait(false);
-            string json = JsonSerializer.Serialize(serialized);
-            await File.WriteAllTextAsync(filename, json).ConfigureAwait(false);
-            await ux.WriteInfoLineAsync($"Session exported to {filename}").ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            await ux.WriteInfoLineAsync($"Failed to export session to {filename}: {ex.Message}").ConfigureAwait(false);
-        }
-    }
-
-    private async Task HandleImportAsync(string input, IUXStateDriver ux)
-    {
-        string[] parts = input.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (parts.Length < 2)
-        {
-            await ux.WriteInfoLineAsync("Usage: /session-import <filename>").ConfigureAwait(false);
-            return;
-        }
-
-        string filename = parts[1];
-        try
-        {
-            string json = await File.ReadAllTextAsync(filename).ConfigureAwait(false);
-            JsonElement element = JsonSerializer.Deserialize<JsonElement>(json);
-            AgentSession newSession = await this._agent.DeserializeSessionAsync(element).ConfigureAwait(false);
-            await ux.ReplaceSessionAsync(newSession).ConfigureAwait(false);
-            await ux.WriteInfoLineAsync($"Session imported from {filename}").ConfigureAwait(false);
-        }
-        catch (FileNotFoundException)
-        {
-            await ux.WriteInfoLineAsync($"File not found: {filename}").ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            await ux.WriteInfoLineAsync($"Failed to import session from {filename}: {ex.Message}").ConfigureAwait(false);
-        }
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Commands/TodoCommandHandler.cs

@@ -7,7 +7,7 @@ namespace Harness.Shared.Console.Commands;
 /// <summary>
 /// Handles the <c>/todos</c> command to display the current todo list.
 /// </summary>
-public sealed class TodoCommandHandler : CommandHandler
+internal sealed class TodoCommandHandler : ICommandHandler
 {
     private readonly TodoProvider? _todoProvider;
 
@@ -21,10 +21,10 @@ public sealed class TodoCommandHandler : CommandHandler
     }
 
     /// <inheritdoc/>
-    public override string? GetHelpText() => this._todoProvider is not null ? "/todos (show todo list)" : null;
+    public string? GetHelpText() => this._todoProvider is not null ? "/todos (show todo list)" : null;
 
     /// <inheritdoc/>
-    public override async ValueTask<bool> TryHandleAsync(string input, AgentSession session, IUXStateDriver ux)
+    public bool TryHandle(string input, AgentSession session)
     {
         if (!input.Equals("/todos", StringComparison.OrdinalIgnoreCase))
         {
@@ -33,28 +33,34 @@ public sealed class TodoCommandHandler : CommandHandler
 
         if (this._todoProvider is null)
         {
-            await ux.WriteInfoLineAsync("TodoProvider is not available.").ConfigureAwait(false);
+            System.Console.WriteLine("TodoProvider is not available.");
             return true;
         }
 
-        var todos = await this._todoProvider.GetAllTodosAsync(session).ConfigureAwait(false);
+        var todos = this._todoProvider.GetAllTodos(session);
         if (todos.Count == 0)
         {
-            await ux.WriteInfoLineAsync("No todos yet.").ConfigureAwait(false);
+            System.Console.WriteLine("\n  No todos yet.\n");
             return true;
         }
 
-        await ux.WriteInfoLineAsync("── Todo List ──").ConfigureAwait(false);
+        System.Console.WriteLine();
+        System.Console.WriteLine("  ── Todo List ──");
         foreach (var item in todos)
         {
             string status = item.IsComplete ? "✓" : "○";
-            ConsoleColor color = item.IsComplete ? ConsoleColor.DarkGray : ConsoleColor.White;
-            string description = string.IsNullOrWhiteSpace(item.Description)
-                ? string.Empty
-                : $" — {item.Description}";
-            await ux.WriteInfoLineAsync($"[{status}] #{item.Id} {item.Title}{description}", color).ConfigureAwait(false);
+            System.Console.ForegroundColor = item.IsComplete ? ConsoleColor.DarkGray : ConsoleColor.White;
+            System.Console.Write($"  [{status}] #{item.Id} {item.Title}");
+            if (!string.IsNullOrWhiteSpace(item.Description))
+            {
+                System.Console.Write($" — {item.Description}");
+            }
+
+            System.Console.WriteLine();
         }
 
+        System.Console.ResetColor();
+        System.Console.WriteLine();
         return true;
     }
 }

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Components/AgentModeAndHelp.cs

@@ -1,71 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveComponents;
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.Shared.Console.Components;
-
-/// <summary>
-/// Props for <see cref="AgentModeAndHelp"/>.
-/// </summary>
-public record AgentModeAndHelpProps : ConsoleReactiveProps
-{
-    /// <summary>Gets or sets the current mode name (e.g. "plan", "execute"), or <see langword="null"/> if no mode is active.</summary>
-    public string? Mode { get; set; }
-
-    /// <summary>Gets or sets the foreground color for the mode label.</summary>
-    public ConsoleColor? ModeColor { get; set; }
-
-    /// <summary>Gets or sets the help text to display (e.g. available commands and exit info).</summary>
-    public string? HelpText { get; set; }
-}
-
-/// <summary>
-/// A component that renders a single fixed line below the bottom rule showing
-/// the current agent mode (in the mode colour) and available commands (in dark grey).
-/// </summary>
-public class AgentModeAndHelp : ConsoleReactiveComponent<AgentModeAndHelpProps, ConsoleReactiveState>
-{
-    /// <summary>
-    /// Calculates the height of the component.
-    /// </summary>
-    /// <param name="props">The component props.</param>
-    /// <returns>1 if there is content to display; otherwise 0.</returns>
-    public static int CalculateHeight(AgentModeAndHelpProps props) =>
-        (props.Mode is not null || !string.IsNullOrEmpty(props.HelpText)) ? 1 : 0;
-
-    /// <inheritdoc />
-    public override void RenderCore(AgentModeAndHelpProps props, ConsoleReactiveState state)
-    {
-        if (props.Mode is null && string.IsNullOrEmpty(props.HelpText))
-        {
-            return;
-        }
-
-        System.Console.Write(AnsiEscapes.SaveCursor);
-        System.Console.Write(AnsiEscapes.MoveAndEraseLine(props.Y));
-
-        bool hasMode = props.Mode is not null;
-
-        if (hasMode)
-        {
-            if (props.ModeColor.HasValue)
-            {
-                System.Console.Write(AnsiEscapes.SetForegroundColor(props.ModeColor.Value));
-            }
-
-            System.Console.Write($" [{props.Mode}]");
-            System.Console.Write(AnsiEscapes.ResetAttributes);
-        }
-
-        if (!string.IsNullOrEmpty(props.HelpText))
-        {
-            string prefix = hasMode ? "  " : " ";
-            System.Console.Write(AnsiEscapes.SetForegroundColor(ConsoleColor.DarkGray));
-            System.Console.Write($"{prefix}{props.HelpText}");
-            System.Console.Write(AnsiEscapes.ResetAttributes);
-        }
-
-        System.Console.Write(AnsiEscapes.RestoreCursor);
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Components/AgentStatus.cs

@@ -1,126 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.ConsoleReactiveComponents;
-using Harness.ConsoleReactiveFramework;
-
-namespace Harness.Shared.Console.Components;
-
-/// <summary>
-/// Props for <see cref="AgentStatus"/>.
-/// </summary>
-public record AgentStatusProps : ConsoleReactiveProps
-{
-    /// <summary>Gets or sets a value indicating whether the spinner is visible.</summary>
-    public bool ShowSpinner { get; set; }
-
-    /// <summary>Gets or sets the formatted token usage text to display.</summary>
-    public string? UsageText { get; set; }
-}
-
-/// <summary>
-/// State for <see cref="AgentStatus"/>.
-/// </summary>
-/// <param name="SpinnerIndex">The current spinner animation frame index.</param>
-public record AgentStatusState(int SpinnerIndex = 0) : ConsoleReactiveState;
-
-/// <summary>
-/// A component that renders a single-line agent status bar with an animated spinner
-/// and token usage statistics. Positioned above the rule in the non-scrolling area.
-/// </summary>
-public class AgentStatus : ConsoleReactiveComponent<AgentStatusProps, AgentStatusState>, IDisposable
-{
-    private static readonly string[] s_spinnerFrames =
-    [
-        "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏",
-    ];
-
-    private readonly Timer _timer;
-    private AgentStatusProps? _previousProps;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AgentStatus"/> class.
-    /// </summary>
-    public AgentStatus()
-    {
-        this.State = new AgentStatusState();
-        this._timer = new Timer(this.OnTimerTick, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(100));
-    }
-
-    /// <summary>
-    /// Calculates the height of the agent status component.
-    /// </summary>
-    /// <param name="props">The component props.</param>
-    /// <returns>1 if the spinner or usage text is visible; otherwise 0.</returns>
-    public static int CalculateHeight(AgentStatusProps props)
-    {
-        return (props.ShowSpinner || !string.IsNullOrEmpty(props.UsageText)) ? 1 : 0;
-    }
-
-    /// <summary>
-    /// Disposes the internal spinner timer.
-    /// </summary>
-    public void Dispose()
-    {
-        this.Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    /// Releases managed resources.
-    /// </summary>
-    /// <param name="disposing"><c>true</c> to release managed resources.</param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            this._timer.Dispose();
-        }
-    }
-
-    /// <inheritdoc />
-    public override void RenderCore(AgentStatusProps props, AgentStatusState state)
-    {
-        if (!props.ShowSpinner && string.IsNullOrEmpty(props.UsageText))
-        {
-            return;
-        }
-
-        System.Console.Write(AnsiEscapes.SaveCursor);
-        System.Console.Write(AnsiEscapes.MoveCursor(props.Y, props.X));
-        if (props != this._previousProps)
-        {
-            System.Console.Write(AnsiEscapes.EraseToEndOfLine);
-            this._previousProps = props;
-        }
-
-        if (props.ShowSpinner)
-        {
-            string frame = s_spinnerFrames[state.SpinnerIndex];
-            System.Console.Write(AnsiEscapes.SetForegroundColor(ConsoleColor.Cyan));
-            System.Console.Write($" {frame} ");
-            System.Console.Write(AnsiEscapes.ResetAttributes);
-        }
-        else
-        {
-            System.Console.Write("   ");
-        }
-
-        if (!string.IsNullOrEmpty(props.UsageText))
-        {
-            System.Console.Write(AnsiEscapes.SetForegroundColor(ConsoleColor.DarkGray));
-            System.Console.Write(props.UsageText);
-            System.Console.Write(AnsiEscapes.ResetAttributes);
-        }
-
-        System.Console.Write(AnsiEscapes.RestoreCursor);
-    }
-
-    private void OnTimerTick(object? timerState)
-    {
-        if (this.Props is { ShowSpinner: true })
-        {
-            int nextIndex = ((this.State?.SpinnerIndex ?? 0) + 1) % s_spinnerFrames.Length;
-            this.SetState(new AgentStatusState(nextIndex));
-        }
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/ConsoleWriter.cs

@@ -0,0 +1,278 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Spectre.Console;
+
+namespace Harness.Shared.Console;
+
+/// <summary>
+/// Centralizes all console output and spinner management for the harness console.
+/// Observers write through this class so the spinner is automatically paused before output.
+/// </summary>
+public sealed class ConsoleWriter : IDisposable
+{
+    private readonly Spinner _spinner = new();
+    private readonly IReadOnlyDictionary<string, ConsoleColor>? _modeColors;
+
+    private bool _lastWasText;
+    private bool _hasReceivedAnyText;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConsoleWriter"/> class.
+    /// </summary>
+    /// <param name="modeColors">Optional mapping of mode names to console colors.</param>
+    public ConsoleWriter(IReadOnlyDictionary<string, ConsoleColor>? modeColors = null)
+    {
+        this._modeColors = modeColors;
+    }
+
+    /// <summary>
+    /// Gets or sets the current agent mode (e.g., "plan", "execute").
+    /// Used to determine the console color for mode-prefixed output.
+    /// </summary>
+    public string? CurrentMode { get; set; }
+
+    /// <summary>
+    /// Writes the agent response header (e.g., "[plan] Agent: ") and starts the spinner.
+    /// </summary>
+    public void WriteResponseHeader()
+    {
+        if (this.CurrentMode is not null)
+        {
+            System.Console.ForegroundColor = GetModeColor(this.CurrentMode, this._modeColors);
+            System.Console.Write($"\n[{this.CurrentMode}] Agent: ");
+        }
+        else
+        {
+            System.Console.Write("\nAgent: ");
+        }
+
+        this._lastWasText = true;
+        this._hasReceivedAnyText = false;
+        this._spinner.Start();
+    }
+
+    /// <summary>
+    /// Writes informational output with automatic prefix spacing, without a trailing newline.
+    /// Use when continuation content will be appended on the same line.
+    /// </summary>
+    /// <param name="text">The informational text to write (without leading newline/indent — added automatically).</param>
+    /// <param name="color">Optional console color for the text.</param>
+    public async Task WriteInfoAsync(string text, ConsoleColor? color = null)
+    {
+        await this.WriteInfoCoreAsync(text, color, newLine: false);
+    }
+
+    /// <summary>
+    /// Writes informational output with automatic prefix spacing, followed by a newline.
+    /// </summary>
+    /// <param name="text">The informational text to write (without leading newline/indent — added automatically).</param>
+    /// <param name="color">Optional console color for the text.</param>
+    public async Task WriteInfoLineAsync(string text, ConsoleColor? color = null)
+    {
+        await this.WriteInfoCoreAsync(text, color, newLine: true);
+    }
+
+    private async Task WriteInfoCoreAsync(string text, ConsoleColor? color, bool newLine)
+    {
+        await this._spinner.StopAsync();
+
+        string prefix = this._lastWasText ? "\n\n  " : "  ";
+        this._lastWasText = false;
+
+        System.Console.ForegroundColor = color ?? GetModeColor(this.CurrentMode, this._modeColors);
+
+        if (newLine)
+        {
+            System.Console.WriteLine(prefix + text);
+        }
+        else
+        {
+            System.Console.Write(prefix + text);
+        }
+
+        System.Console.ForegroundColor = GetModeColor(this.CurrentMode, this._modeColors);
+
+        this._spinner.Start();
+    }
+
+    /// <summary>
+    /// Writes text output from the agent, managing line break state.
+    /// Ensures a newline is written before the first text output.
+    /// </summary>
+    /// <param name="text">The text to write.</param>
+    /// <param name="color">Optional console color override for this text.</param>
+    public async Task WriteTextAsync(string text, ConsoleColor? color = null)
+    {
+        await this._spinner.StopAsync();
+
+        if (!this._lastWasText)
+        {
+            System.Console.Write("\n");
+            this._lastWasText = true;
+        }
+
+        this._hasReceivedAnyText = true;
+
+        if (color.HasValue)
+        {
+            System.Console.ForegroundColor = color.Value;
+        }
+
+        System.Console.Write(text);
+
+        if (color.HasValue)
+        {
+            System.Console.ForegroundColor = GetModeColor(this.CurrentMode, this._modeColors);
+        }
+
+        this._spinner.Start();
+    }
+
+    /// <summary>
+    /// Reads a line of input from the console, pausing the spinner while waiting for input.
+    /// Optionally displays a prompt before reading. The prompt is rendered between
+    /// two horizontal rules for visual clarity.
+    /// </summary>
+    /// <param name="prompt">Optional prompt text to display before reading input.</param>
+    /// <param name="promptColor">Optional console color for the prompt text.</param>
+    /// <returns>The line read from the console, or <c>null</c> if no input is available.</returns>
+    public async Task<string?> ReadLineAsync(string? prompt = null, ConsoleColor? promptColor = null)
+    {
+        await this._spinner.StopAsync();
+
+        if (prompt is not null)
+        {
+            System.Console.WriteLine();
+            AnsiConsole.Write(this.CreateModeRule());
+
+            if (promptColor.HasValue)
+            {
+                System.Console.ForegroundColor = promptColor.Value;
+            }
+
+            System.Console.Write($"  {prompt}");
+
+            if (promptColor.HasValue)
+            {
+                System.Console.ForegroundColor = GetModeColor(this.CurrentMode, this._modeColors);
+            }
+        }
+
+        string? input = System.Console.ReadLine();
+
+        if (prompt is not null)
+        {
+            AnsiConsole.Write(this.CreateModeRule());
+        }
+
+        this._lastWasText = false;
+        return input;
+    }
+
+    /// <summary>
+    /// Presents a selection prompt with the given choices, plus an option to type a custom response.
+    /// Uses Spectre.Console <see cref="SelectionPrompt{T}"/> for interactive arrow-key selection.
+    /// </summary>
+    /// <param name="title">The title/question displayed above the selection list.</param>
+    /// <param name="choices">The list of choices to present.</param>
+    /// <returns>The selected choice text, or the custom-typed response.</returns>
+    public async Task<string> ReadSelectionAsync(string title, IList<string> choices)
+    {
+        await this._spinner.StopAsync();
+
+        AnsiConsole.Write(this.CreateModeRule());
+
+        const string FreeformOption = "✏️  Type a custom response...";
+        var allChoices = choices.Concat([FreeformOption]).ToList();
+
+        var prompt = new SelectionPrompt<string>()
+            .Title($"  [bold]{Markup.Escape(title)}[/]")
+            .PageSize(10)
+            .AddChoices(allChoices);
+
+        string selection = AnsiConsole.Prompt(prompt);
+
+        if (selection == FreeformOption)
+        {
+            var textPrompt = new TextPrompt<string>("  [grey]Response:[/]");
+            selection = AnsiConsole.Prompt(textPrompt);
+        }
+
+        AnsiConsole.MarkupLine($"  [dim]→ {Markup.Escape(selection)}[/]");
+        AnsiConsole.Write(this.CreateModeRule());
+
+        this._lastWasText = false;
+        return selection;
+    }
+
+    /// <summary>
+    /// Writes the stream-complete footer (handles "no text response" fallback, resets color).
+    /// </summary>
+    public async Task WriteStreamFooterAsync(bool hasFollowUpMessages)
+    {
+        await this._spinner.StopAsync();
+
+        if (!this._hasReceivedAnyText && !hasFollowUpMessages)
+        {
+            System.Console.ForegroundColor = ConsoleColor.DarkYellow;
+            System.Console.Write("\n  (no text response from agent)");
+        }
+
+        System.Console.ResetColor();
+        System.Console.WriteLine();
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this._spinner.Dispose();
+    }
+
+    /// <summary>
+    /// Gets the console color associated with a mode name, using the provided color map.
+    /// </summary>
+    internal static ConsoleColor GetModeColor(string? mode, IReadOnlyDictionary<string, ConsoleColor>? modeColors = null)
+    {
+        if (mode is null)
+        {
+            return ConsoleColor.Gray;
+        }
+
+        if (modeColors is not null && modeColors.TryGetValue(mode, out var color))
+        {
+            return color;
+        }
+
+        return ConsoleColor.Gray;
+    }
+
+    /// <summary>
+    /// Creates a <see cref="Rule"/> styled with the current mode color.
+    /// </summary>
+    internal Rule CreateModeRule()
+    {
+        var spectreColor = ToSpectreColor(GetModeColor(this.CurrentMode, this._modeColors));
+        return new Rule().RuleStyle(new Style(spectreColor));
+    }
+
+    internal static Color ToSpectreColor(ConsoleColor consoleColor) => consoleColor switch
+    {
+        ConsoleColor.Black => Color.Black,
+        ConsoleColor.DarkBlue => Color.Blue,
+        ConsoleColor.DarkGreen => Color.Green,
+        ConsoleColor.DarkCyan => Color.Teal,
+        ConsoleColor.DarkRed => Color.Red,
+        ConsoleColor.DarkMagenta => Color.Purple,
+        ConsoleColor.DarkYellow => Color.Olive,
+        ConsoleColor.Gray => Color.Silver,
+        ConsoleColor.DarkGray => Color.Grey,
+        ConsoleColor.Blue => Color.Blue1,
+        ConsoleColor.Green => Color.Green1,
+        ConsoleColor.Cyan => Color.Aqua,
+        ConsoleColor.Red => Color.Red1,
+        ConsoleColor.Magenta => Color.Fuchsia,
+        ConsoleColor.Yellow => Color.Yellow,
+        ConsoleColor.White => Color.White,
+        _ => Color.Silver,
+    };
+}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/FileSpanExporter.cs

@@ -1,67 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Diagnostics;
-using System.Globalization;
-using OpenTelemetry;
-
-namespace Harness.Shared.Console;
-
-/// <summary>
-/// A simple OpenTelemetry span exporter that writes completed activities (spans) to a text file.
-/// Each span is formatted as a human-readable block with timestamps, operation name, duration,
-/// status, and any tags/events.
-/// </summary>
-public sealed class FileSpanExporter : BaseExporter<Activity>
-{
-    private readonly string _filePath;
-    private readonly object _lock = new();
-
-    public FileSpanExporter(string filePath)
-    {
-        this._filePath = filePath;
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
-    }
-
-    public override ExportResult Export(in Batch<Activity> batch)
-    {
-        lock (this._lock)
-        {
-            using var writer = new StreamWriter(this._filePath, append: true);
-            foreach (var activity in batch)
-            {
-                WriteActivity(writer, activity);
-            }
-        }
-
-        return ExportResult.Success;
-    }
-
-    private static void WriteActivity(StreamWriter writer, Activity activity)
-    {
-        var start = activity.StartTimeUtc.ToString("yyyy-MM-dd HH:mm:ss.fff", CultureInfo.InvariantCulture);
-        var duration = activity.Duration.TotalMilliseconds.ToString("F1", CultureInfo.InvariantCulture);
-
-        writer.WriteLine($"[{start}] {activity.OperationName} ({duration}ms) [{activity.Status}]");
-
-        if (!string.IsNullOrEmpty(activity.DisplayName) && activity.DisplayName != activity.OperationName)
-        {
-            writer.WriteLine($"  DisplayName: {activity.DisplayName}");
-        }
-
-        foreach (var tag in activity.Tags)
-        {
-            writer.WriteLine($"  {tag.Key}: {tag.Value}");
-        }
-
-        foreach (var ev in activity.Events)
-        {
-            writer.WriteLine($"  Event: {ev.Name} @ {ev.Timestamp:HH:mm:ss.fff}");
-            foreach (var tag in ev.Tags)
-            {
-                writer.WriteLine($"    {tag.Key}: {tag.Value}");
-            }
-        }
-
-        writer.WriteLine();
-    }
-}

dotnet/samples/02-agents/Harness/Harness_Shared_Console/FollowUpAction.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Microsoft.Extensions.AI;
-
-namespace Harness.Shared.Console;
-
-/// <summary>
-/// Represents an action returned by an observer at the end of an agent turn.
-/// Subtypes describe either a question to ask the user (<see cref="FollowUpQuestion"/>)
-/// or a message to add directly to the next agent input (<see cref="FollowUpMessage"/>).
-/// </summary>
-public abstract record FollowUpAction;
-
-/// <summary>
-/// Represents a question that should be presented to the user. The
-/// <see cref="Continuation"/> delegate is invoked with the user's answer and the
-/// UX state driver, and returns an optional <see cref="ChatMessage"/> to add to the
-/// next agent invocation.
-/// </summary>
-/// <param name="Prompt">The question text shown to the user.</param>
-/// <param name="Continuation">
-/// Invoked with the user's answer and the UX state driver. The driver lets the
-/// continuation write output (e.g., an action label like "Approved") in addition
-/// to producing an optional <see cref="ChatMessage"/> for the next agent invocation.
-/// </param>
-public abstract record FollowUpQuestion(
-    string Prompt,
-    Func<string, IUXStateDriver, Task<ChatMessage?>> Continuation) : FollowUpAction;
-
-/// <summary>
-/// A free-form text question. The user may type any response.
-/// </summary>
-/// <param name="Prompt">The question text shown to the user.</param>
-/// <param name="Continuation">Continuation that builds the response message.</param>
-public sealed record TextFollowUpQuestion(
-    string Prompt,
-    Func<string, IUXStateDriver, Task<ChatMessage?>> Continuation)
-    : FollowUpQuestion(Prompt, Continuation);
-
-/// <summary>
-/// A choice question. The user picks from <paramref name="Choices"/>, optionally with
-/// the ability to enter custom text when <paramref name="AllowCustomText"/> is true.
-/// </summary>
-/// <param name="Prompt">The question text shown to the user.</param>
-/// <param name="Choices">The list of pre-defined choices.</param>
-/// <param name="AllowCustomText">If true, the user may type a custom response in addition to the listed choices.</param>
-/// <param name="Continuation">Continuation that builds the response message.</param>
-public sealed record ChoiceFollowUpQuestion(
-    string Prompt,
-    IReadOnlyList<string> Choices,
-    bool AllowCustomText,
-    Func<string, IUXStateDriver, Task<ChatMessage?>> Continuation)
-    : FollowUpQuestion(Prompt, Continuation);
-
-/// <summary>
-/// A message to add directly to the next agent invocation without prompting the user.
-/// </summary>
-/// <param name="Message">The chat message to add.</param>
-public sealed record FollowUpMessage(ChatMessage Message) : FollowUpAction;

dotnet/samples/02-agents/Harness/Harness_Shared_Console/HarnessAgentRunner.cs

@@ -1,303 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Harness.Shared.Console.Commands;
-using Harness.Shared.Console.Observers;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.AI;
-
-namespace Harness.Shared.Console;
-
-/// <summary>
-/// Orchestrates agent invocations driven by user-input events from the UI.
-/// The component invokes the runner's input handlers (<see cref="OnUserInputAsync"/>,
-/// <see cref="OnStreamingInputAsync"/>, <see cref="StartAgentTurnAsync"/>) directly;
-/// the runner mutates UI state through the supplied <see cref="IUXStateDriver"/>.
-/// All per-turn follow-up state (pending questions and accumulated responses) lives
-/// in the component's state record — the runner reads/writes it exclusively through
-/// the driver and holds no per-turn fields itself.
-/// </summary>
-public sealed class HarnessAgentRunner : IDisposable
-{
-    private readonly AIAgent _agent;
-    private readonly AgentModeProvider? _modeProvider;
-    private readonly MessageInjectingChatClient? _messageInjector;
-    private readonly IReadOnlyList<CommandHandler> _commandHandlers;
-    private readonly IReadOnlyList<ConsoleObserver> _observers;
-    private readonly IUXStateDriver _ux;
-    private readonly SemaphoreSlim _inputGate = new(1, 1);
-
-    private AgentSession _session;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HarnessAgentRunner"/> class.
-    /// </summary>
-    public HarnessAgentRunner(
-        AIAgent agent,
-        AgentSession session,
-        AgentModeProvider? modeProvider,
-        MessageInjectingChatClient? messageInjector,
-        IReadOnlyList<CommandHandler> commandHandlers,
-        IReadOnlyList<ConsoleObserver> observers,
-        IUXStateDriver ux)
-    {
-        this._agent = agent;
-        this._session = session;
-        this._modeProvider = modeProvider;
-        this._messageInjector = messageInjector;
-        this._commandHandlers = commandHandlers;
-        this._observers = observers;
-        this._ux = ux;
-
-        this.HelpText = string.Join(
-            ", ",
-            commandHandlers
-                .Select(h => h.GetHelpText())
-                .Where(t => t is not null)!);
-    }
-
-    /// <summary>
-    /// Gets the help text describing all available commands (joined by ", "), suitable
-    /// for display in the mode-and-help bar. Computed from the supplied
-    /// <c>commandHandlers</c>.
-    /// </summary>
-    public string HelpText { get; }
-
-    /// <summary>
-    /// Replaces the current session with the specified session. Used by the UX driver
-    /// when importing a serialized session. Acquires the input gate to ensure no
-    /// concurrent agent turn is reading the session.
-    /// </summary>
-    /// <param name="newSession">The new session to use.</param>
-    internal async Task ReplaceSessionAsync(AgentSession newSession)
-    {
-        await this._inputGate.WaitAsync().ConfigureAwait(false);
-        try
-        {
-            this._session = newSession;
-        }
-        finally
-        {
-            this._inputGate.Release();
-        }
-    }
-
-    /// <inheritdoc/>
-    public void Dispose() => this._inputGate.Dispose();
-
-    /// <summary>
-    /// Handles a top-level user input submission (TextInput mode, no pending question).
-    /// Dispatches to command handlers, or starts an agent turn.
-    /// </summary>
-    internal async Task OnUserInputAsync(string text)
-    {
-        await this._inputGate.WaitAsync().ConfigureAwait(false);
-        try
-        {
-            this._ux.WriteUserInputEcho(text);
-
-            foreach (var handler in this._commandHandlers)
-            {
-                if (await handler.TryHandleAsync(text, this._session, this._ux).ConfigureAwait(false))
-                {
-                    this._ux.CurrentMode = this._modeProvider?.GetMode(this._session);
-                    return;
-                }
-            }
-
-            await this.RunAgentLoopAsync([new ChatMessage(ChatRole.User, text)]).ConfigureAwait(false);
-        }
-        finally
-        {
-            this._inputGate.Release();
-        }
-    }
-
-    /// <summary>
-    /// Handles a user input submission while an agent turn is streaming. The text is
-    /// enqueued via the <see cref="MessageInjectingChatClient"/> so it can be picked up
-    /// by the agent on its next opportunity.
-    /// </summary>
-    internal Task OnStreamingInputAsync(string text)
-    {
-        if (this._messageInjector is null)
-        {
-            return Task.CompletedTask;
-        }
-
-        this._messageInjector.EnqueueMessages(this._session, [new ChatMessage(ChatRole.User, text)]);
-        this._ux.SetQueuedMessages(this._messageInjector.GetPendingMessages(this._session));
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Resumes (or completes) a turn after the user has answered all pending follow-up
-    /// questions. The component invokes this with the messages drained from
-    /// <see cref="IUXStateDriver.TakeFollowUpResponses"/>; an empty list simply ends
-    /// the streaming display state without invoking the agent.
-    /// </summary>
-    internal async Task StartAgentTurnAsync(IList<ChatMessage> messages)
-    {
-        await this._inputGate.WaitAsync().ConfigureAwait(false);
-        try
-        {
-            if (messages.Count == 0)
-            {
-                this.CompleteTurn();
-                return;
-            }
-
-            await this.RunAgentLoopAsync(messages).ConfigureAwait(false);
-        }
-        finally
-        {
-            this._inputGate.Release();
-        }
-    }
-
-    private async Task RunAgentLoopAsync(IList<ChatMessage> messages)
-    {
-        IList<ChatMessage>? nextMessages = messages;
-        IReadOnlyList<ChatMessage> lastPendingMessages = this._messageInjector?.GetPendingMessages(this._session) ?? [];
-
-        while (nextMessages is not null)
-        {
-            var runOptions = new AgentRunOptions();
-            foreach (var observer in this._observers)
-            {
-                observer.ConfigureRunOptions(runOptions, this._agent, this._session);
-            }
-
-            this._ux.CurrentMode = this._modeProvider?.GetMode(this._session);
-            this._ux.BeginStreaming();
-            this._ux.BeginStreamingOutput();
-
-            try
-            {
-                await foreach (var update in this._agent.RunStreamingAsync(nextMessages, this._session, runOptions))
-                {
-                    if (this._modeProvider is not null)
-                    {
-                        string currentMode = this._modeProvider.GetMode(this._session);
-                        if (currentMode != this._ux.CurrentMode)
-                        {
-                            this._ux.CurrentMode = currentMode;
-                        }
-                    }
-
-                    foreach (var content in update.Contents)
-                    {
-                        foreach (var observer in this._observers)
-                        {
-                            await observer.OnContentAsync(this._ux, content, this._agent, this._session).ConfigureAwait(false);
-                        }
-                    }
-
-                    foreach (var observer in this._observers)
-                    {
-                        await observer.OnResponseUpdateAsync(this._ux, update, this._agent, this._session).ConfigureAwait(false);
-                    }
-
-                    if (!string.IsNullOrEmpty(update.Text))
-                    {
-                        foreach (var observer in this._observers)
-                        {
-                            await observer.OnTextAsync(this._ux, update.Text, this._agent, this._session).ConfigureAwait(false);
-                        }
-                    }
-
-                    this.SyncQueuedMessageDisplay(ref lastPendingMessages);
-                }
-            }
-            catch (Exception ex)
-            {
-                await this._ux.WriteInfoLineAsync($"❌ Stream error: {ex.GetType().Name}:\n{ex}", ConsoleColor.Red).ConfigureAwait(false);
-            }
-
-            // Final sync after streaming.
-            this.SyncQueuedMessageDisplay(ref lastPendingMessages);
-
-            this._ux.StopSpinner();
-            await this._ux.EndStreamingOutputAsync().ConfigureAwait(false);
-
-            // Collect FollowUpActions from each observer.
-            var directMessages = new List<ChatMessage>();
-            var questions = new List<FollowUpQuestion>();
-            foreach (var observer in this._observers)
-            {
-                var actions = await observer.OnStreamCompleteAsync(this._ux, this._agent, this._session).ConfigureAwait(false);
-                if (actions is null)
-                {
-                    continue;
-                }
-
-                foreach (var action in actions)
-                {
-                    switch (action)
-                    {
-                        case FollowUpMessage msg:
-                            directMessages.Add(msg.Message);
-                            break;
-                        case FollowUpQuestion q:
-                            questions.Add(q);
-                            break;
-                    }
-                }
-            }
-
-            bool hasFollowUpActions = directMessages.Count > 0 || questions.Count > 0;
-            await this._ux.WriteNoTextWarningAsync(hasFollowUpActions).ConfigureAwait(false);
-
-            // Add any direct messages to the accumulator regardless of whether questions follow —
-            // they're sent on the next agent invocation, either by us (if no questions) or by
-            // the component (after the user finishes answering, via StartAgentTurnAsync).
-            foreach (var msg in directMessages)
-            {
-                this._ux.AddFollowUpResponse(msg);
-            }
-
-            if (questions.Count > 0)
-            {
-                // Pause: hand control back to the UX to collect answers.
-                this._ux.QueueFollowUpQuestions(questions);
-                return;
-            }
-
-            // No questions to ask — drain anything we just accumulated and loop with it.
-            IReadOnlyList<ChatMessage> drained = this._ux.TakeFollowUpResponses();
-            nextMessages = drained.Count > 0 ? [.. drained] : null;
-        }
-
-        this.CompleteTurn();
-    }
-
-    private void CompleteTurn()
-    {
-        this._ux.EndStreaming();
-        this._ux.CurrentMode = this._modeProvider?.GetMode(this._session);
-    }
-
-    /// <summary>
-    /// Synchronizes the queued items display with the message injector's pending messages.
-    /// Messages that have been consumed (drained by the service) are echoed to the output
-    /// area as regular user-input entries.
-    /// </summary>
-    private void SyncQueuedMessageDisplay(ref IReadOnlyList<ChatMessage> lastPendingMessages)
-    {
-        if (this._messageInjector is null)
-        {
-            return;
-        }
-
-        var pending = this._messageInjector.GetPendingMessages(this._session);
-
-        int consumedCount = lastPendingMessages.Count - pending.Count;
-        for (int i = 0; i < consumedCount && i < lastPendingMessages.Count; i++)
-        {
-            string text = lastPendingMessages[i].Text ?? string.Empty;
-            this._ux.WriteUserInputEcho(text);
-        }
-
-        lastPendingMessages = pending;
-        this._ux.SetQueuedMessages(pending);
-    }
-}