Fix tests

.github/.linkspector.yml

@@ -20,10 +20,7 @@ ignorePatterns:
   - pattern: "https://your-resource.openai.azure.com/"
   - pattern: "http://host.docker.internal"
   - pattern: "https://openai.github.io/openai-agents-js/openai/agents/classes/"
-  # dotnet.microsoft.com bot-blocks CI link checkers with intermittent 403s on any
-  # path (including localized variants like /en-us/download/...), so ignore the
-  # whole domain rather than just /download.
-  - pattern: "https:\/\/dotnet.microsoft.com"
+  - pattern: "https:\/\/dotnet.microsoft.com\/download"
   - pattern: "https://github.com/Rel1cx/eslint-react"
 # excludedDirs:
   # Folders which include links to localhost, since it's not ignored with regular expressions

.github/ISSUE_TEMPLATE/dotnet-issue.yml

@@ -1,7 +1,7 @@
 name: .NET Bug Report
 description: Report a bug in the Agent Framework .NET SDK
 title: ".NET: [Bug]: "
-labels: [".NET"]
+labels: ["bug", ".NET"]
 type: bug
 body:
   - type: textarea

.github/ISSUE_TEMPLATE/python-issue.yml

@@ -1,7 +1,7 @@
 name: Python Bug Report
 description: Report a bug in the Agent Framework Python SDK
 title: "Python: [Bug]: "
-labels: ["Python"]
+labels: ["bug", "Python"]
 type: bug
 body:
   - type: textarea

.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@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6
         with:
             version-file: "python/pyproject.toml"
             enable-cache: true
@@ -46,4 +46,4 @@ runs:
       - name: Install the project
         shell: bash
         run: |
-          cd python && uv sync --all-packages --all-extras --all-groups --prerelease=if-necessary-or-explicit
+          cd python && uv sync --all-packages --all-extras --dev --prerelease=if-necessary-or-explicit

.github/dependabot.yml

@@ -24,14 +24,12 @@ updates:
       - ".NET"
       - "dependencies"
 
-  # Maintain dependencies for python.
-  # TODO: Remove these Python Dependabot entries after we have confidence in the
-  # Python dependency-maintenance workflow.
+  # Maintain dependencies for python
   - package-ecosystem: "pip"
     directory: "python/"
     schedule:
       interval: "weekly"
-      day: "thursday"
+      day: "monday"
     labels:
       - "python"
       - "dependencies"
@@ -39,7 +37,7 @@ updates:
     directory: "python/"
     schedule:
       interval: "weekly"
-      day: "thursday"
+      day: "monday"
     labels:
       - "python"
       - "dependencies"

.github/pull_request_template.md

@@ -1,43 +1,23 @@
-### Motivation & Context
+### Motivation and Context
 
 <!-- Thank you for your contribution to the Agent Framework repo!
 Please help reviewers and future users, providing the following information:
   1. Why is this change required?
   2. What problem does it solve?
   3. What scenario does it contribute to?
-  4. If it fixes an open issue, please link to the issue below.
+  4. If it fixes an open issue, please link to the issue here.
 -->
 
-### Description & Review Guide
+### Description
 
 <!-- Describe your changes, the overall approach, the underlying design.
-     Highlight what you want the reviewers to focus on.
      These notes will help understanding how your code works. Thanks! -->
 
-- **What are the major changes?**
-- **What is the impact of these changes?**
-- **What do you want reviewers to focus on?**
-<!-- NOTE FOR AUTOMATED/AI REVIEWERS: the "What do you want reviewers to focus on?"
-     item above is intended for human reviewers only. Automated/AI reviewers should
-     ignore it and review the entire change rather than narrowing scope to it. -->
-
-
-### Related Issue
-
-<!-- Which issue does this PR fix? Link it using a GitHub closing keyword so it is
-     closed automatically when this PR is merged, e.g. "Fixes #123" or "Closes #123".
-     PRs that are not linked to an issue may be closed, no matter how valid the change is.
-     Also check whether an open PR already exists for this issue; if so,
-     explain how this PR is different. -->
-
-Fixes #
-
 ### Contribution Checklist
 
 <!-- Before submitting this PR, please make sure: -->
 
 - [ ] The code builds clean without any errors or warnings
-- [ ] All unit tests pass, and I have added new tests where possible
 - [ ] The PR follows the [Contribution Guidelines](https://github.com/microsoft/agent-framework/blob/main/CONTRIBUTING.md)
-- [ ] This PR is linked to an issue and there is no other open PR for this issue (see Related Issue above).
-- [x] **This is not a breaking change.** If it _is_ a breaking change, add the `breaking change` label (or add "[BREAKING]" to the title prefix, before or after any language prefix) — a workflow keeps the label and title prefix in sync automatically.
+- [ ] All unit tests pass, and I have added new tests where possible
+- [ ] **Is this a breaking change?** If yes, add "[BREAKING]" prefix to the title of the PR.

.github/scripts/pr_limit_moderation.js

@@ -8,7 +8,6 @@ function getPullRequest(context) {
 
   return {
     author: pullRequest.user.login,
-    authorType: pullRequest.user.type,
     labels: pullRequest.labels?.map((label) => label.name).filter(Boolean) ?? [],
     number: pullRequest.number,
   };
@@ -50,10 +49,6 @@ function hasLabel(labels, labelName) {
   return labels.some((label) => label.toLowerCase() === labelName.toLowerCase());
 }
 
-function isDependabotAuthor({ author, authorType }) {
-  return authorType === 'Bot' && author.toLowerCase() === 'dependabot[bot]';
-}
-
 function buildLimitMessage({ author, exemptLabelName, maxOpenPrs, openPrCount }) {
   return [
     `Thank you for your contribution, @${author}.`,
@@ -68,37 +63,24 @@ function buildLimitMessage({ author, exemptLabelName, maxOpenPrs, openPrCount })
 }
 
 async function getOpenPrCount({ github, owner, repo, author, pullRequestNumber }) {
-  const openPullRequests = await github.paginate(github.rest.pulls.list, {
-    owner,
-    repo,
-    state: 'open',
+  const query = `repo:${owner}/${repo} is:pr is:open author:${author}`;
+  const response = await github.rest.search.issuesAndPullRequests({
+    q: query,
     per_page: 100,
   });
 
-  const authorOpenPullRequestNumbers = openPullRequests
-    .filter((pullRequest) => pullRequest.user?.login === author)
-    .map((pullRequest) => pullRequest.number);
-  const currentPrIsOpen = authorOpenPullRequestNumbers.includes(pullRequestNumber);
-  const existingOpenPrCount = currentPrIsOpen
-    ? authorOpenPullRequestNumbers.length - 1
-    : authorOpenPullRequestNumbers.length;
+  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 existingOpenPrCount + 1;
+  return response.data.total_count + 1;
 }
 
 async function enforcePrLimit({ github, context, core, exemptLabelName, maxOpenPrs, labelName }) {
   const { owner, repo } = context.repo;
-  const { author, authorType, labels, number } = getPullRequest(context);
-
-  if (isDependabotAuthor({ author, authorType })) {
-    core.info(`Author ${author} is Dependabot; skipping open PR limit enforcement.`);
-    return {
-      author,
-      closed: false,
-      dependabotExempt: true,
-      openPrCount: null,
-    };
-  }
+  const { author, labels, number } = getPullRequest(context);
 
   if (hasLabel(labels, exemptLabelName)) {
     core.info(`PR #${number} has the ${exemptLabelName} label; skipping open PR limit enforcement.`);

.github/scripts/title_prefix.js

@@ -1,253 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-const BREAKING_CHANGE_LABEL = 'breaking change';
-const BREAKING_PREFIX = '[BREAKING]';
-
-const DEFAULT_PREFIX_LABELS = Object.freeze({
-  python: 'Python',
-  '.NET': '.NET',
-});
-
-const DEFAULT_BRACKET_PREFIX_LABELS = Object.freeze({
-  [BREAKING_CHANGE_LABEL]: BREAKING_PREFIX,
-});
-
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-function getMatchingValueByKey(valuesByKey, keyToFind) {
-  const matchingKey = Object.keys(valuesByKey).find((key) => key.toLowerCase() === keyToFind.toLowerCase());
-  return matchingKey === undefined ? null : valuesByKey[matchingKey];
-}
-
-function getPrefixPattern(prefixes) {
-  return prefixes.map(escapeRegExp).join('|');
-}
-
-function canonicalizePrefix(prefix, prefixes) {
-  return prefixes.find((knownPrefix) => knownPrefix.toLowerCase() === prefix.toLowerCase()) ?? prefix;
-}
-
-function normalizeLeadingBracketPrefix(title, bracketPrefixes) {
-  const bracketPattern = getPrefixPattern(bracketPrefixes);
-  if (!bracketPattern) {
-    return title;
-  }
-
-  const leadingBracketPrefix = new RegExp(`^(${bracketPattern})(?=\\s|$)`, 'i');
-  return title.replace(
-    leadingBracketPrefix,
-    (bracketPrefix) => canonicalizePrefix(bracketPrefix, bracketPrefixes),
-  );
-}
-
-function parseLeadingTitlePrefix(title, titlePrefixes) {
-  const titlePrefixPattern = getPrefixPattern(titlePrefixes);
-  if (!titlePrefixPattern) {
-    return null;
-  }
-
-  const match = title.match(new RegExp(`^(${titlePrefixPattern}):\\s*`, 'i'));
-  if (!match) {
-    return null;
-  }
-
-  return {
-    prefix: canonicalizePrefix(match[1], titlePrefixes),
-    rest: title.slice(match[0].length).trimStart(),
-  };
-}
-
-function removeBracketPrefixToken(title, bracketPrefix) {
-  const bracketPrefixPattern = escapeRegExp(bracketPrefix);
-  return title
-    .replace(new RegExp(`(^|\\s+)${bracketPrefixPattern}(?=\\s|$)`, 'ig'), '$1')
-    .replace(/\s{2,}/g, ' ')
-    .trim();
-}
-
-function addTitlePrefix(title, prefix, bracketPrefixes = Object.values(DEFAULT_BRACKET_PREFIX_LABELS)) {
-  const bracketPattern = getPrefixPattern(bracketPrefixes);
-  const prefixPattern = escapeRegExp(prefix);
-
-  if (bracketPattern) {
-    const bracketThenTitlePrefix = new RegExp(`^(${bracketPattern})(\\s+)(${prefixPattern})(?=:)`, 'i');
-    if (bracketThenTitlePrefix.test(title)) {
-      return title.replace(
-        bracketThenTitlePrefix,
-        (match, bracketPrefix, spacing) => `${canonicalizePrefix(bracketPrefix, bracketPrefixes)}${spacing}${prefix}`,
-      );
-    }
-
-    title = normalizeLeadingBracketPrefix(title, bracketPrefixes);
-  }
-
-  if (!title.startsWith(`${prefix}: `)) {
-    const existingTitlePrefix = new RegExp(`^${prefixPattern}:\\s*`, 'i');
-    if (existingTitlePrefix.test(title)) {
-      return title.replace(existingTitlePrefix, `${prefix}: `);
-    }
-
-    return `${prefix}: ${title}`;
-  }
-
-  return title;
-}
-
-function hasBracketPrefix(title, bracketPrefix, titlePrefixes = Object.values(DEFAULT_PREFIX_LABELS)) {
-  const bracketPrefixPattern = escapeRegExp(bracketPrefix);
-  const leadingBracketPrefix = new RegExp(`^${bracketPrefixPattern}(?=\\s|$)`, 'i');
-  if (leadingBracketPrefix.test(title)) {
-    return true;
-  }
-
-  const leadingTitlePrefix = parseLeadingTitlePrefix(title, titlePrefixes);
-  if (!leadingTitlePrefix) {
-    return false;
-  }
-
-  return leadingBracketPrefix.test(leadingTitlePrefix.rest);
-}
-
-function addBracketPrefix(title, bracketPrefix, titlePrefixes = Object.values(DEFAULT_PREFIX_LABELS)) {
-  const bracketPrefixPattern = escapeRegExp(bracketPrefix);
-  const leadingBracketPrefix = new RegExp(`^${bracketPrefixPattern}(?=\\s|$)`, 'i');
-  if (leadingBracketPrefix.test(title)) {
-    return title.replace(leadingBracketPrefix, bracketPrefix);
-  }
-
-  const leadingTitlePrefix = parseLeadingTitlePrefix(title, titlePrefixes);
-  if (leadingTitlePrefix) {
-    if (leadingBracketPrefix.test(leadingTitlePrefix.rest)) {
-      const normalizedRest = leadingTitlePrefix.rest.replace(leadingBracketPrefix, bracketPrefix);
-      return `${leadingTitlePrefix.prefix}: ${normalizedRest}`;
-    }
-
-    const titleWithoutBracketPrefix = removeBracketPrefixToken(leadingTitlePrefix.rest, bracketPrefix);
-    return `${leadingTitlePrefix.prefix}: ${bracketPrefix}`
-      + (titleWithoutBracketPrefix ? ` ${titleWithoutBracketPrefix}` : '');
-  }
-
-  const titleWithoutBracketPrefix = removeBracketPrefixToken(title, bracketPrefix);
-  return `${bracketPrefix}${titleWithoutBracketPrefix ? ` ${titleWithoutBracketPrefix}` : ''}`;
-}
-
-function hasLabel(labels, labelName) {
-  return labels.some((label) => label.toLowerCase() === labelName.toLowerCase());
-}
-
-function getCurrentTitle(context) {
-  switch (context.eventName) {
-    case 'issues':
-      return context.payload.issue.title;
-    case 'pull_request_target':
-      return context.payload.pull_request.title;
-    default:
-      throw new Error(`Unrecognized eventName: ${context.eventName}`);
-  }
-}
-
-async function updateTitleForAddedLabel({
-  github,
-  context,
-  core,
-  prefixLabels = DEFAULT_PREFIX_LABELS,
-  bracketPrefixLabels = DEFAULT_BRACKET_PREFIX_LABELS,
-}) {
-  const labelAdded = context.payload.label?.name;
-  if (!labelAdded) {
-    throw new Error('This script must be run from a labeled event.');
-  }
-
-  const currentTitle = getCurrentTitle(context);
-  let newTitle = null;
-
-  const titlePrefix = getMatchingValueByKey(prefixLabels, labelAdded);
-  if (titlePrefix !== null) {
-    newTitle = addTitlePrefix(currentTitle, titlePrefix, Object.values(bracketPrefixLabels));
-  }
-
-  const bracketPrefix = getMatchingValueByKey(bracketPrefixLabels, labelAdded);
-  if (bracketPrefix !== null) {
-    newTitle = addBracketPrefix(currentTitle, bracketPrefix, Object.values(prefixLabels));
-  }
-
-  if (newTitle === null) {
-    core.info(`No title prefix configured for label "${labelAdded}".`);
-    return { updated: false, newTitle: currentTitle };
-  }
-
-  if (newTitle === currentTitle) {
-    core.info(`Title already includes the prefix for label "${labelAdded}".`);
-    return { updated: false, newTitle };
-  }
-
-  switch (context.eventName) {
-    case 'issues':
-      await github.rest.issues.update({
-        issue_number: context.issue.number,
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        title: newTitle,
-      });
-      break;
-
-    case 'pull_request_target':
-      await github.rest.pulls.update({
-        pull_number: context.issue.number,
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        title: newTitle,
-      });
-      break;
-
-    default:
-      throw new Error(`Unrecognized eventName: ${context.eventName}`);
-  }
-
-  return { updated: true, newTitle };
-}
-
-async function syncBreakingChangeLabelFromTitle({
-  github,
-  context,
-  core,
-  labelName = BREAKING_CHANGE_LABEL,
-  bracketPrefix = BREAKING_PREFIX,
-  titlePrefixes = Object.values(DEFAULT_PREFIX_LABELS),
-}) {
-  const pullRequest = context.payload.pull_request;
-  if (!pullRequest) {
-    throw new Error('This script must be run from a pull_request_target event.');
-  }
-
-  const title = pullRequest.title || '';
-  if (!hasBracketPrefix(title, bracketPrefix, titlePrefixes)) {
-    core.info(`Title does not include ${bracketPrefix} in the title prefix.`);
-    return { added: false };
-  }
-
-  const labels = pullRequest.labels?.map((label) => label.name).filter(Boolean) ?? [];
-  if (hasLabel(labels, labelName)) {
-    core.info(`PR already has the "${labelName}" label.`);
-    return { added: false };
-  }
-
-  await github.rest.issues.addLabels({
-    issue_number: context.issue.number,
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    labels: [labelName],
-  });
-
-  return { added: true };
-}
-
-module.exports = {
-  addBracketPrefix,
-  addTitlePrefix,
-  hasBracketPrefix,
-  syncBreakingChangeLabelFromTitle,
-  updateTitleForAddedLabel,
-};

.github/skills/pull-requests/SKILL.md

@@ -1,116 +0,0 @@
----
-name: pull-requests
-description: >
-  Guidance for creating pull requests and handling PR review comments in the
-  Agent Framework repository. Use this when writing a PR description (filling out
-  the PR template) or when responding to and resolving review comments on an
-  existing PR.
----
-
-# Pull Request Workflow
-
-This skill covers two tasks: (1) writing a high-quality PR description, and
-(2) handling review comments on an existing PR.
-
-## 1. Writing the PR description
-
-Always follow the repository PR template at
-[`.github/pull_request_template.md`](../../pull_request_template.md). Keep its
-exact structure and headings. Fill every section:
-
-### `### Motivation & Context`
-Explain *why* the change is needed: the problem it solves and the scenario it
-contributes to. Describe the net change relative to `main` — this is implied, so
-do **not** spell out "vs main" explicitly.
-
-### `### Description & Review Guide`
-Describe the changes, the overall approach, and the design. Answer the three
-prompts:
-- **What are the major changes?**
-- **What is the impact of these changes?**
-- **What do you want reviewers to focus on?** — This item is for **human
-  reviewers only**. Automated/AI reviewers must ignore it and review the entire
-  change rather than narrowing scope to it.
-
-### `### Related Issue`
-Link the issue the PR fixes using a GitHub closing keyword (`Fixes #123` /
-`Closes #123`) so it closes automatically on merge. A PR with no linked issue may
-be closed regardless of how valid the change is. Before opening, confirm there is
-no other open PR for the same issue; if there is, explain how this PR differs.
-
-### `### Contribution Checklist`
-Check every item that applies. For the breaking-change item:
-- Leave **"This is not a breaking change."** checked for the common case.
-- If the change **is** breaking, add the `breaking change` label **or** put
-  `[BREAKING]` in the title prefix, before or after a language prefix such as
-  `Python:` or `.NET:` — workflows keep the label and the title prefix in sync
-  automatically (see `.github/workflows/label-title-prefix.yml` and
-  `.github/workflows/label-pr.yml`).
-
-### Do not
-- Do **not** add ad-hoc sections such as "Validation" or "Tests run"; CI/CD and
-  the checklist already cover validation status.
-- Do **not** remove or reorder the template's headings.
-
-### Creating the PR
-Open new PRs as **drafts** until they are ready for review. Example:
-
-```bash
-gh pr create --repo microsoft/agent-framework --base main \
-  --head <your-fork-owner>:<branch> --draft \
-  --title "<concise title>" --body "<body following the template>"
-```
-
-## 2. Handling review comments
-
-When a PR receives review comments, follow this sequence — **do not start editing
-code before the user has reviewed the plan**:
-
-1. **Review the comments.** Read every review comment and thread on the PR,
-   including inline code comments and general review summaries.
-2. **Make a plan.** Produce a concrete plan describing how each comment will be
-   addressed (or why it should not be, with reasoning).
-3. **Let the user review the plan.** Present the plan and wait for the user's
-   approval or adjustments before implementing anything.
-4. **Implement.** Make the agreed changes.
-5. **Reply to every comment.** Add a reply to **all** comments explaining how it
-   was addressed (or the agreed outcome) — leave none unanswered.
-6. **Resolve resolved threads.** Mark a review thread as resolved only when the
-   comment has actually been addressed.
-
-### Useful commands
-
-List review comments and threads:
-
-```bash
-# Inline review comments
-gh api repos/{owner}/{repo}/pulls/{pr}/comments
-
-# Review threads with resolution state (GraphQL)
-gh api graphql -f query='
-  query($owner:String!,$repo:String!,$pr:Int!){
-    repository(owner:$owner,name:$repo){
-      pullRequest(number:$pr){
-        reviewThreads(first:100){
-          nodes{ id isResolved comments(first:50){ nodes{ id body author{login} } } }
-        }
-      }
-    }
-  }' -F owner={owner} -F repo={repo} -F pr={pr}
-```
-
-Reply to an inline review comment:
-
-```bash
-gh api repos/{owner}/{repo}/pulls/{pr}/comments/{comment_id}/replies \
-  -f body="Addressed in <commit>: <explanation>"
-```
-
-Resolve a review thread (needs the thread node id from the GraphQL query above):
-
-```bash
-gh api graphql -f query='
-  mutation($threadId:ID!){
-    resolveReviewThread(input:{threadId:$threadId}){ thread{ isResolved } }
-  }' -F threadId={thread_id}
-```

.github/tests/test_pr_limit_moderation.js

@@ -16,7 +16,7 @@ const { enforcePrLimit } = require('../scripts/pr_limit_moderation.js');
 // Helpers
 // ---------------------------------------------------------------------------
 
-function createContext({ author = 'community-user', authorType = 'User', labels = [], number = 123 } = {}) {
+function createContext({ author = 'community-user', labels = [], number = 123 } = {}) {
   return {
     repo: {
       owner: 'microsoft',
@@ -28,7 +28,6 @@ function createContext({ author = 'community-user', authorType = 'User', labels
         labels: labels.map((name) => ({ name })),
         user: {
           login: author,
-          type: authorType,
         },
       },
     },
@@ -45,20 +44,23 @@ function createCore() {
   };
 }
 
-function createGithub({
-  itemNumbers,
-  labelExists = true,
-  pullRequests = createPullRequestPage({ numbers: itemNumbers }),
-}) {
+function createGithub({ totalCount, itemNumbers, labelExists = true }) {
   const calls = [];
 
   return {
     calls,
-    async paginate(method, params) {
-      calls.push({ api: 'paginate', method, params });
-      return pullRequests;
-    },
     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 });
@@ -83,10 +85,6 @@ function createGithub({
         },
       },
       pulls: {
-        async list(params) {
-          calls.push({ api: 'pulls.list', params });
-          return { data: pullRequests };
-        },
         async update(params) {
           calls.push({ api: 'pulls.update', params });
           return { data: { state: params.state } };
@@ -96,15 +94,6 @@ function createGithub({
   };
 }
 
-function createPullRequestPage({ author = 'community-user', numbers }) {
-  return numbers.map((number) => ({
-    number,
-    user: {
-      login: author,
-    },
-  }));
-}
-
 
 // ---------------------------------------------------------------------------
 // PR limit enforcement
@@ -113,6 +102,7 @@ function createPullRequestPage({ author = 'community-user', numbers }) {
 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],
     });
 
@@ -129,13 +119,14 @@ describe('PR limit enforcement', () => {
     assert.equal(result.openPrCount, 10);
     assert.deepEqual(
       github.calls.map((call) => call.api),
-      ['paginate'],
+      ['search.issuesAndPullRequests'],
     );
   });
 
-  it('counts the new PR when the pull list includes it', async () => {
+  it('counts the new PR when search has not indexed it yet', async () => {
     const github = createGithub({
-      itemNumbers: [123, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      totalCount: 10,
+      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
     });
 
     const result = await enforcePrLimit({
@@ -152,7 +143,7 @@ describe('PR limit enforcement', () => {
     assert.deepEqual(
       github.calls.map((call) => call.api),
       [
-        'paginate',
+        'search.issuesAndPullRequests',
         'issues.getLabel',
         'issues.addLabels',
         'issues.createComment',
@@ -161,31 +152,9 @@ describe('PR limit enforcement', () => {
     );
   });
 
-  it('counts the current PR on top of existing open PRs', async () => {
-    const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 24 }, (_, index) => index + 1)],
-      pullRequests: createPullRequestPage({
-        numbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      }),
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 26);
-    const comment = github.calls.find((call) => call.api === 'issues.createComment').params.body;
-    assert.match(comment, /This PR would put you at 26 open pull requests/);
-  });
-
   it('creates the label when it does not already exist', async () => {
     const github = createGithub({
+      totalCount: 11,
       itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
       labelExists: false,
     });
@@ -203,7 +172,7 @@ describe('PR limit enforcement', () => {
     assert.deepEqual(
       github.calls.map((call) => call.api),
       [
-        'paginate',
+        'search.issuesAndPullRequests',
         'issues.getLabel',
         'issues.createLabel',
         'issues.addLabels',
@@ -219,6 +188,7 @@ describe('PR limit enforcement', () => {
 
   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,
     });
@@ -242,7 +212,7 @@ describe('PR limit enforcement', () => {
     assert.deepEqual(
       github.calls.map((call) => call.api),
       [
-        'paginate',
+        'search.issuesAndPullRequests',
         'issues.getLabel',
         'issues.createLabel',
         'issues.addLabels',
@@ -254,11 +224,8 @@ describe('PR limit enforcement', () => {
 
   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],
-      pullRequests: createPullRequestPage({
-        author: 'octo-contributor',
-        numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      }),
     });
 
     await enforcePrLimit({
@@ -279,6 +246,7 @@ describe('PR limit enforcement', () => {
 
   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],
     });
 
@@ -297,33 +265,10 @@ describe('PR limit enforcement', () => {
     assert.deepEqual(github.calls, []);
   });
 
-  it('does not close Dependabot PRs', async () => {
+  it('does not over-count when the current PR is not on the first search page', async () => {
     const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      pullRequests: createPullRequestPage({
-        author: 'dependabot[bot]',
-        numbers: [123, ...Array.from({ length: 25 }, (_, index) => index + 1)],
-      }),
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ author: 'dependabot[bot]', authorType: 'Bot' }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.dependabotExempt, true);
-    assert.equal(result.openPrCount, null);
-    assert.deepEqual(github.calls, []);
-  });
-
-  it('counts the current PR when the author has more than one page of open PRs', async () => {
-    const github = createGithub({
-      itemNumbers: [123, ...Array.from({ length: 100 }, (_, index) => index + 1)],
+      totalCount: 101,
+      itemNumbers: Array.from({ length: 100 }, (_, index) => index + 1),
     });
 
     const result = await enforcePrLimit({

.github/upgrades/prompts/SemanticKernelToAgentFramework.md

@@ -23,16 +23,16 @@ For each project that needs to be migrated, you need to do the following:
 - Identify the specific Semantic Kernel agent types being used:
   - `ChatCompletionAgent` → `ChatClientAgent`
   - `OpenAIAssistantAgent` → `assistantsClient.CreateAIAgent()` (via OpenAI Assistants client extension)
-  - `AzureAIAgent` → `persistentAgentsClient.CreateAIAgent()` (via Microsoft Foundry client extension)
+  - `AzureAIAgent` → `persistentAgentsClient.CreateAIAgent()` (via Azure AI Foundry client extension)
   - `OpenAIResponseAgent` → `responsesClient.CreateAIAgent()` (via OpenAI Responses client extension)
   - `A2AAgent` → `AIAgent` (via A2A card resolver)
   - `BedrockAgent` → Custom implementation required (not supported)
 - Determine if agents are being created new or retrieved from hosted services:
   - **New agents**: Use `CreateAIAgent()` methods
-  - **Existing hosted agents**: Use `GetAIAgent(agentId)` methods for OpenAI Assistants and Microsoft Foundry
+  - **Existing hosted agents**: Use `GetAIAgent(agentId)` methods for OpenAI Assistants and Azure AI Foundry
 </agent_type_identification>
 
-- Determine the AI provider being used (OpenAI, Azure OpenAI, Microsoft Foundry, etc.)
+- Determine the AI provider being used (OpenAI, Azure OpenAI, Azure AI Foundry, etc.)
 - Analyze tool/function registration patterns
 - Review thread management and invocation patterns
 
@@ -90,7 +90,7 @@ below in wrong order or skip any of them):
    you generate report when migration complete. Report should contain:
      - all project dependencies changes (mention what was changed, added or removed, including provider-specific packages)
      - all code files that were changed (mention what was changed in the file, if it was not changed, just mention that the file was not changed)
-     - provider-specific migration patterns used (OpenAI, Azure OpenAI, Microsoft Foundry, A2A, ONNX, etc.)
+     - provider-specific migration patterns used (OpenAI, Azure OpenAI, Azure AI Foundry, A2A, ONNX, etc.)
      - all cases where you could not convert the code because of unsupported features and you were unable to find a workaround
      - unsupported providers that require custom implementation (Bedrock, CopilotStudio)
      - breaking glass pattern migrations (InnerContent → RawRepresentation) and any CodeInterpreter or advanced tool usage
@@ -223,7 +223,7 @@ using Microsoft.Agents.AI;
 // Provider-specific namespaces (add only if needed):
 using OpenAI; // For OpenAI provider
 using Azure.AI.OpenAI; // For Azure OpenAI provider
-using Azure.AI.Agents.Persistent; // For Microsoft Foundry provider
+using Azure.AI.Agents.Persistent; // For Azure AI Foundry provider
 using Azure.Identity; // For Azure authentication
 ```
 </configuration_changes>
@@ -499,7 +499,7 @@ For every thread created if there's intent to cleanup, the caller should track a
 var assistantClient = new OpenAIClient(apiKey).GetAssistantClient();
 await assistantClient.DeleteThreadAsync(thread.ConversationId);
 
-// For Microsoft Foundry (when cleanup is needed):
+// For Azure AI Foundry (when cleanup is needed):
 var persistentClient = new PersistentAgentsClient(endpoint, credential);
 await persistentClient.Threads.DeleteThreadAsync(thread.ConversationId);
 
@@ -514,7 +514,7 @@ await persistentClient.Threads.DeleteThreadAsync(thread.ConversationId);
 1. Remove `thread.DeleteAsync()` calls
 2. Use provider-specific client for cleanup when required
 3. Access thread ID via `thread.ConversationId` property
-4. Only implement cleanup for providers that require it (Assistants, Microsoft Foundry)
+4. Only implement cleanup for providers that require it (Assistants, Azure AI Foundry)
 </api_changes>
 
 ### Provider-Specific Creation Patterns
@@ -550,13 +550,13 @@ AIAgent agent = new AzureOpenAIClient(endpoint, credential)
     .CreateAIAgent(instructions: instructions);
 ```
 
-**Microsoft Foundry (New):**
+**Azure AI Foundry (New):**
 ```csharp
 AIAgent agent = new PersistentAgentsClient(endpoint, credential)
     .CreateAIAgent(model: deploymentName, instructions: instructions);
 ```
 
-**Microsoft Foundry (Existing):**
+**Azure AI Foundry (Existing):**
 ```csharp
 AIAgent agent = await new PersistentAgentsClient(endpoint, credential)
     .GetAIAgentAsync(agentId);
@@ -1079,7 +1079,7 @@ AgentThread thread = agent.GetNewThread();
 ```
 </api_changes>
 
-### 4. Microsoft Foundry (AzureAIAgent) Migration
+### 4. Azure AI Foundry (AzureAIAgent) Migration
 
 <configuration_changes>
 **Remove Semantic Kernel Packages:**

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # 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@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4
+        uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # 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@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
         with:
           category: "/language:${{matrix.language}}"

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

@@ -140,7 +140,7 @@ jobs:
           python-version: "3.13"
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
         with:
           version: "0.11.x"
           enable-cache: true

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

@@ -42,7 +42,7 @@ jobs:
       coreChanged: ${{ steps.filter.outputs.core }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
         id: filter
         with:
           filters: |
@@ -121,9 +121,6 @@ jobs:
               python
               declarative-agents
 
-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
@@ -194,9 +191,6 @@ jobs:
               python
               declarative-agents
 
-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
       # Start Cosmos DB Emulator for all integration tests and only for unit tests when CosmosDB changes happened)
       - name: Start Azure Cosmos DB Emulator
         if: ${{ runner.os == 'Windows' && (needs.paths-filter.outputs.cosmosDbChanges == 'true' || (github.event_name != 'pull_request' && matrix.integration-tests)) }}
@@ -312,15 +306,14 @@ jobs:
           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 }}
-          # Microsoft Foundry
+          # 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 }}
           # Anthropic Models
-          # Disable Anthropic tests by not providing environment vars until 404 failure is resolved
-          # 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 }}
+          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
@@ -372,9 +365,6 @@ jobs:
             dotnet
             python
 
-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
@@ -462,9 +452,6 @@ jobs:
             python
             declarative-agents
 
-      - name: Free runner disk space
-        uses: ./.github/actions/free-runner-disk-space
-
       - name: Setup dotnet
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
@@ -528,7 +515,7 @@ jobs:
           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 }}
-          # Microsoft Foundry
+          # 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 }}
@@ -610,12 +597,12 @@ jobs:
           python-version: "3.13"
           os: ${{ runner.os }}
       - name: Download all test results from current run
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           pattern: dotnet-test-results-*
           path: dotnet-test-results/
       - name: Restore report history cache
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/dotnet-integration-report-history.json
           key: dotnet-integration-report-history-${{ github.run_id }}
@@ -632,7 +619,7 @@ jobs:
         run: cat dotnet-integration-test-report.md >> $GITHUB_STEP_SUMMARY
       - name: Save report history cache
         if: always()
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/dotnet-integration-report-history.json
           key: dotnet-integration-report-history-${{ github.run_id }}

.github/workflows/dotnet-format.yml

@@ -54,14 +54,11 @@ jobs:
       - name: Find csproj files
         id: find-csproj
         if: github.event_name != 'pull_request' || steps.changed-files.outputs.added_modified != '' || steps.changed-files.outcome == 'failure'
-        env:
-          ADDED_MODIFIED: ${{ steps.changed-files.outputs.added_modified }}
         run: |
           csproj_files=()
           exclude_files=("Experimental.Orchestration.Flow.csproj" "Experimental.Orchestration.Flow.UnitTests.csproj" "Experimental.Orchestration.Flow.IntegrationTests.csproj")
-          set -f
           if [[ ${{ steps.changed-files.outcome }} == 'success' ]]; then
-            for file in $ADDED_MODIFIED; do
+            for file in ${{ steps.changed-files.outputs.added_modified }}; do
               echo "$file was changed"
               dir="./$file"
               while [[ $dir != "." && $dir != "/" && $dir != $GITHUB_WORKSPACE ]]; do
@@ -83,7 +80,6 @@ jobs:
           csproj_files=($(printf "%s\n" "${csproj_files[@]}" | sort -u))
           echo "Found ${#csproj_files[@]} unique csproj/slnx files: ${csproj_files[*]}"
           echo "csproj_files=${csproj_files[*]}" >> $GITHUB_OUTPUT
-          set +f
 
       - name: Pull container dotnet/sdk:${{ matrix.dotnet }}
         if: steps.find-csproj.outputs.csproj_files != ''
@@ -92,11 +88,8 @@ jobs:
       # This step will run dotnet format on each of the unique csproj files and fail if any changes are made
       - name: Run dotnet format
         if: steps.find-csproj.outputs.csproj_files != ''
-        env:
-          CSPROJ_FILES: ${{ steps.find-csproj.outputs.csproj_files }}
         run: |
-          set -f
-          for csproj in $CSPROJ_FILES; do
+          for csproj in ${{ steps.find-csproj.outputs.csproj_files }}; do
             echo "Running dotnet format on $csproj"
-            docker run --rm -v "$(pwd):/app" -w /app mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }} dotnet format "$csproj" --verify-no-changes --verbosity diagnostic
+            docker run --rm -v $(pwd):/app -w /app mcr.microsoft.com/dotnet/sdk:${{ matrix.dotnet }} /bin/sh -c "dotnet format $csproj --verify-no-changes --verbosity diagnostic"
           done

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

@@ -88,7 +88,6 @@ jobs:
         env:
           COSMOSDB_ENDPOINT: https://localhost:8081
           COSMOSDB_KEY: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
           OpenAI__ApiKey: ${{ secrets.OPENAI__APIKEY }}
           OpenAI__ChatModelId: ${{ vars.OPENAI__CHATMODELID }}
           OpenAI__ChatReasoningModelId: ${{ vars.OPENAI__CHATREASONINGMODELID }}

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

@@ -105,13 +105,10 @@ jobs:
           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 }}
-          # Microsoft Foundry
+          # 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 }}
-          # Foundry
-          FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
-          FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
 
       - name: Write Job Summary
         if: always()

.github/workflows/issue-triage.yml

@@ -2,13 +2,7 @@ name: Issue Triage
 
 on:
   issues:
-    types: [opened, typed]
-  workflow_dispatch:
-    inputs:
-      issue_number:
-        description: Issue number to triage
-        required: true
-        type: string
+    types: [opened, labeled]
 
 permissions:
   contents: read
@@ -18,8 +12,9 @@ permissions:
 concurrency:
   group: >-
     issue-triage-${{ github.repository }}-${{
-      github.event_name == 'workflow_dispatch' && inputs.issue_number
-      || github.event.issue.type.name == 'Bug' && github.event.issue.number
+      ((github.event.action == 'opened' && contains(github.event.issue.labels.*.name, 'bug'))
+       || (github.event.action == 'labeled' && github.event.label.name == 'bug'))
+      && github.event.issue.number
       || github.run_id
     }}
   cancel-in-progress: true
@@ -33,11 +28,7 @@ env:
 jobs:
   team_check:
     runs-on: ubuntu-latest
-    if: >-
-      ${{
-        github.event_name == 'workflow_dispatch'
-        || github.event.issue.type.name == 'Bug'
-      }}
+    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 }}
@@ -47,18 +38,14 @@ jobs:
         id: issue
         shell: bash
         env:
-          ISSUE_NUMBER: >-
-            ${{
-              github.event_name == 'workflow_dispatch' && inputs.issue_number
-              || github.event.issue.number
-            }}
+          ISSUE_NUMBER_EVENT: ${{ github.event.issue.number }}
         run: |
           set -euo pipefail
 
-          issue_number="${ISSUE_NUMBER}"
+          issue_number="${ISSUE_NUMBER_EVENT}"
 
           if [[ ! "$issue_number" =~ ^[1-9][0-9]*$ ]]; then
-            echo "Could not determine issue number from event payload or manual input." >&2
+            echo "Could not determine issue number from event payload." >&2
             exit 1
           fi
 
@@ -73,7 +60,6 @@ jobs:
           persist-credentials: false
 
       - name: Check issue author team membership
-        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: check
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         env:
@@ -100,11 +86,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     needs: team_check
-    if: >-
-      ${{
-        github.event_name == 'workflow_dispatch'
-        || needs.team_check.outputs.is_team_member == 'false'
-      }}
+    if: ${{ needs.team_check.outputs.is_team_member == 'false' }}
     environment: integration
     timeout-minutes: 60
 
@@ -134,7 +116,7 @@ jobs:
           python-version: "3.13"
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
         with:
           version: "0.11.x"
           enable-cache: true

.github/workflows/label-issues.yml

@@ -90,7 +90,9 @@ jobs:
             // Check for issue type from issue form dropdown
             const issueTypeField = getFormFieldValue(body, 'Type of Issue')
             if (issueTypeField) {
-              if (issueTypeField === 'Feature Request') {
+              if (issueTypeField === 'Bug') {
+                labels.push("bug")
+              } else if (issueTypeField === 'Feature Request') {
                 labels.push("enhancement")
               } else if (issueTypeField === 'Question') {
                 labels.push("question")

.github/workflows/label-pr.yml

@@ -6,34 +6,16 @@
 # https://github.com/actions/labeler
 
 name: Label pull request
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened, edited]
+on: [pull_request_target]
 
 jobs:
   add_label:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      issues: write
       pull-requests: write
 
     steps:
       - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6
         with:
           repo-token: "${{ secrets.GH_ACTIONS_PR_WRITE }}"
-
-      - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          sparse-checkout: .github/scripts
-          fetch-depth: 1
-          persist-credentials: false
-
-      - name: "PR: add breaking change label from title"
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        with:
-          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
-          script: |
-            const { syncBreakingChangeLabelFromTitle } = require('./.github/scripts/title_prefix.js');
-            await syncBreakingChangeLabelFromTitle({ github, context, core });

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

@@ -15,17 +15,58 @@ jobs:
       pull-requests: write
 
     steps:
-      - name: Checkout scripts
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          sparse-checkout: .github/scripts
-          fetch-depth: 1
-          persist-credentials: false
-
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         name: "Issue/PR: update title"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const { updateTitleForAddedLabel } = require('./.github/scripts/title_prefix.js');
-            await updateTitleForAddedLabel({ github, context, core });
+            let prefixLabels = {
+              "python": "Python",
+              ".NET": ".NET"
+            };
+
+            function addTitlePrefix(title, prefix)
+            {
+              // Update the title based on the label and prefix
+              // Check if the title starts with the prefix (case-sensitive)
+              if (!title.startsWith(prefix + ": ")) {
+                // If not, check if the first word is the label (case-insensitive)
+                if (title.match(new RegExp(`^${prefix}`, 'i'))) {
+                  // If yes, replace it with the prefix (case-sensitive)
+                  title = title.replace(new RegExp(`^${prefix}`, 'i'), prefix);
+                } else {
+                  // If not, prepend the prefix to the title
+                  title = prefix + ": " + title;
+                }
+              }
+
+              return title;
+            }
+
+            labelAdded = context.payload.label.name
+
+            // Check if the issue or PR has the label
+            if (labelAdded in prefixLabels) {
+              let prefix = prefixLabels[labelAdded];
+              switch(context.eventName) {
+                case 'issues':
+                  github.rest.issues.update({
+                    issue_number: context.issue.number,
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    title: addTitlePrefix(context.payload.issue.title, prefix)
+                  });
+                  break
+
+                case 'pull_request_target':
+                  github.rest.pulls.update({
+                    pull_number: context.issue.number,
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    title: addTitlePrefix(context.payload.pull_request.title, prefix)
+                  });
+                  break
+                default:
+                  core.setFailed('Unrecognited eventName: ' + context.eventName);
+              }
+            }

.github/workflows/merge-gatekeeper.yml

@@ -27,7 +27,7 @@ jobs:
           # "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,review"
+          IGNORED_NAMES: "CodeQL,CodeQL analysis (csharp),Cleanup artifacts,Agent,Prepare,Upload results"
         with:
           script: |
             const timeoutSeconds = Number(process.env.TIMEOUT_SECONDS);

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

@@ -6,10 +6,6 @@ on:
     branches: ["main"]
     paths:
       - "python/**"
-      - "!python/AGENTS.md"
-      - "!python/**/AGENTS.md"
-      - "!python/.github/skills/*"
-      - "!python/.github/skills/**"
 
 env:
   # Configure a constant location for the uv cache
@@ -46,7 +42,7 @@ jobs:
         with:
           path: ~/.cache/prek
           key: prek|${{ matrix.python-version }}|${{ hashFiles('python/.pre-commit-config.yaml') }}
-      - uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
+      - uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1
         name: Run Pre-commit Hooks (excluding poe-check)
         env:
           SKIP: poe-check
@@ -113,8 +109,8 @@ jobs:
       - name: Run markdown code lint
         run: uv run poe markdown-code-lint
 
-  test-typing:
-    name: Test Typing Checks
+  mypy:
+    name: Mypy Checks
     if: "!cancelled()"
     strategy:
       fail-fast: false
@@ -139,5 +135,7 @@ jobs:
           os: ${{ runner.os }}
         env:
           UV_CACHE_DIR: /tmp/.uv-cache
-      - name: Run tests/samples type checkers (mypy, pyrefly, ty)
-        run: uv run python scripts/workspace_poe_tasks.py ci-test-typing
+      - name: Run Mypy
+        env:
+          GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref || github.base_ref || 'main' }}
+        run: uv run python scripts/workspace_poe_tasks.py ci-mypy

.github/workflows/python-dependency-maintenance.yml

@@ -1,431 +0,0 @@
-name: Python - Dependency Maintenance
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 4 * * 1"
-
-permissions:
-  contents: write
-  issues: write
-
-concurrency:
-  group: python-dependency-maintenance
-  cancel-in-progress: false
-
-env:
-  UV_CACHE_DIR: /tmp/.uv-cache
-
-jobs:
-  dependency-maintenance:
-    name: Dependency Maintenance
-    runs-on: ubuntu-latest
-    env:
-      # Match the existing Python dependency maintenance workflows. Reevaluate if package
-      # installability starts differing across supported Python versions.
-      UV_PYTHON: "3.13"
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          fetch-depth: 0
-
-      - name: Set up python and install the project
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-        env:
-          UV_CACHE_DIR: /tmp/.uv-cache
-
-      - name: Set dependency release cutoff
-        run: |
-          cutoff="$(date -u -d '7 days ago' '+%Y-%m-%dT%H:%M:%SZ')"
-          echo "DEPENDENCY_RELEASE_CUTOFF=${cutoff}" >> "$GITHUB_ENV"
-          echo "Using dependency release cutoff: ${cutoff}"
-
-      - name: Repin dev dependency declarations
-        run: uv run poe upgrade-dev-dependency-pins
-        working-directory: ./python
-
-      - name: Refresh lockfile after dev pin updates
-        run: uv lock
-        working-directory: ./python
-
-      - name: Save dev dependency changes
-        run: |
-          DEV_PATCH="${RUNNER_TEMP}/python-dev-dependency-updates.patch"
-          git diff -- python/pyproject.toml "python/packages/*/pyproject.toml" python/uv.lock > "${DEV_PATCH}"
-          if [ -s "${DEV_PATCH}" ]; then
-            echo "has_dev_changes=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "has_dev_changes=false" >> "$GITHUB_OUTPUT"
-          fi
-          echo "patch=${DEV_PATCH}" >> "$GITHUB_OUTPUT"
-        id: dev_changes
-
-      - name: Run dependency bounds test scenarios
-        id: validate_bounds_test
-        continue-on-error: true
-        run: uv run poe validate-dependency-bounds-test --package "*"
-        working-directory: ./python
-
-      - name: Run dependency upper-bound validation
-        id: validate_ranges
-        if: steps.validate_bounds_test.outcome == 'success'
-        continue-on-error: true
-        run: uv run poe validate-dependency-bounds-project --mode upper --package "*"
-        working-directory: ./python
-
-      - name: Upload dependency validation reports
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: dependency-maintenance-results
-          path: |
-            python/scripts/dependencies/dependency-bounds-test-results.json
-            python/scripts/dependencies/dependency-range-results.json
-          if-no-files-found: warn
-
-      - name: Create issue for failed dependency bounds test
-        if: steps.validate_bounds_test.outcome != 'success'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const fs = require("fs")
-            const reportPath = "python/scripts/dependencies/dependency-bounds-test-results.json"
-
-            const owner = context.repo.owner
-            const repo = context.repo.repo
-            const openIssues = await github.paginate(github.rest.issues.listForRepo, {
-              owner,
-              repo,
-              state: "open",
-              per_page: 100,
-            })
-            const openIssueTitles = new Set(
-              openIssues.filter((issue) => !issue.pull_request).map((issue) => issue.title)
-            )
-
-            const formatError = (message) => String(message || "No error output captured.").replace(/```/g, "'''")
-            const title = "Dependency bounds test failed"
-            if (openIssueTitles.has(title)) {
-              core.info(`Issue already exists: ${title}`)
-              return
-            }
-
-            const bodyLines = [
-              "Automated dependency bounds test mode failed before dependency upper-bound validation could run.",
-              "",
-              "The weekly dependency maintenance workflow kept only dev dependency updates for the generated PR, if any, and skipped dependency range updates for this run.",
-              "",
-            ]
-
-            if (fs.existsSync(reportPath)) {
-              const report = JSON.parse(fs.readFileSync(reportPath, "utf8"))
-              const failedScenarios = (report.scenarios ?? []).filter((scenario) => scenario.status === "failed")
-              for (const scenario of failedScenarios) {
-                bodyLines.push(`### ${scenario.name} scenario (${scenario.resolution})`)
-                const failedPackages = (scenario.packages ?? []).filter((pkg) => pkg.status === "failed")
-                for (const pkg of failedPackages.slice(0, 10)) {
-                  bodyLines.push(
-                    "",
-                    `- Package: \`${pkg.package_name}\``,
-                    `- Project path: \`${pkg.project_path}\``,
-                    "",
-                    "```",
-                    formatError(pkg.error).slice(0, 3500),
-                    "```"
-                  )
-                }
-                if (failedPackages.length > 10) {
-                  bodyLines.push("", `_Additional failed packages omitted: ${failedPackages.length - 10}_`)
-                }
-              }
-            } else {
-              bodyLines.push(`No dependency bounds test report was found at \`${reportPath}\`.`)
-            }
-
-            bodyLines.push("", `Workflow run: ${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`)
-
-            await github.rest.issues.create({
-              owner,
-              repo,
-              title,
-              body: bodyLines.join("\n"),
-            })
-            core.info(`Created issue: ${title}`)
-
-      - name: Create issues for failed dependency candidates
-        if: always()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const fs = require("fs")
-            const reportPath = "python/scripts/dependencies/dependency-range-results.json"
-
-            if (!fs.existsSync(reportPath)) {
-              core.info(`No dependency range report found at ${reportPath}`)
-              return
-            }
-
-            const report = JSON.parse(fs.readFileSync(reportPath, "utf8"))
-            const dependencyFailures = []
-
-            for (const packageResult of report.packages ?? []) {
-              for (const dependency of packageResult.dependencies ?? []) {
-                const candidateVersions = new Set(dependency.candidate_versions ?? [])
-                const failedAttempts = (dependency.attempts ?? []).filter(
-                  (attempt) => attempt.status === "failed" && candidateVersions.has(attempt.trial_upper)
-                )
-                if (!failedAttempts.length) {
-                  continue
-                }
-
-                const failuresByVersion = new Map()
-                for (const attempt of failedAttempts) {
-                  const version = attempt.trial_upper || "unknown"
-                  if (!failuresByVersion.has(version)) {
-                    failuresByVersion.set(version, attempt.error || "No error output captured.")
-                  }
-                }
-
-                dependencyFailures.push({
-                  packageName: packageResult.package_name,
-                  projectPath: packageResult.project_path,
-                  dependencyName: dependency.name,
-                  originalRequirements: dependency.original_requirements ?? [],
-                  finalRequirements: dependency.final_requirements ?? [],
-                  failedVersions: [...failuresByVersion.entries()].map(([version, error]) => ({ version, error })),
-                })
-              }
-            }
-
-            if (!dependencyFailures.length) {
-              core.info("No failing dependency candidates found.")
-              return
-            }
-
-            const owner = context.repo.owner
-            const repo = context.repo.repo
-            const openIssues = await github.paginate(github.rest.issues.listForRepo, {
-              owner,
-              repo,
-              state: "open",
-              per_page: 100,
-            })
-            const openIssueTitles = new Set(
-              openIssues.filter((issue) => !issue.pull_request).map((issue) => issue.title)
-            )
-
-            const formatError = (message) => String(message || "No error output captured.").replace(/```/g, "'''")
-
-            for (const failure of dependencyFailures) {
-              const title = `Dependency validation failed: ${failure.dependencyName} (${failure.packageName})`
-              if (openIssueTitles.has(title)) {
-                core.info(`Issue already exists: ${title}`)
-                continue
-              }
-
-              const visibleFailures = failure.failedVersions.slice(0, 5)
-              const omittedCount = failure.failedVersions.length - visibleFailures.length
-              const failureDetails = visibleFailures
-                .map(
-                  (entry) =>
-                    `- \`${entry.version}\`\n\n\`\`\`\n${formatError(entry.error).slice(0, 3500)}\n\`\`\``
-                )
-                .join("\n\n")
-
-              const body = [
-                "Automated dependency range validation found candidate versions that failed checks.",
-                "",
-                `- Package: \`${failure.packageName}\``,
-                `- Project path: \`${failure.projectPath}\``,
-                `- Dependency: \`${failure.dependencyName}\``,
-                `- Original requirements: ${
-                  failure.originalRequirements.length
-                    ? failure.originalRequirements.map((value) => `\`${value}\``).join(", ")
-                    : "_none_"
-                }`,
-                `- Final requirements after run: ${
-                  failure.finalRequirements.length
-                    ? failure.finalRequirements.map((value) => `\`${value}\``).join(", ")
-                    : "_none_"
-                }`,
-                "",
-                "### Failed versions and errors",
-                failureDetails,
-                omittedCount > 0 ? `\n_Additional failed versions omitted: ${omittedCount}_` : "",
-                "",
-                `Workflow run: ${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`,
-              ].join("\n")
-
-              await github.rest.issues.create({
-                owner,
-                repo,
-                title,
-                body,
-              })
-              openIssueTitles.add(title)
-              core.info(`Created issue: ${title}`)
-            }
-
-      - name: Keep only dev updates when range validation fails
-        if: steps.validate_bounds_test.outcome != 'success' || steps.validate_ranges.outcome != 'success'
-        env:
-          DEV_PATCH: ${{ steps.dev_changes.outputs.patch }}
-          HAS_DEV_CHANGES: ${{ steps.dev_changes.outputs.has_dev_changes }}
-        run: |
-          git restore python/pyproject.toml python/packages/*/pyproject.toml python/uv.lock
-          if [ "${HAS_DEV_CHANGES}" = "true" ]; then
-            git apply "${DEV_PATCH}"
-          fi
-
-      - name: Refresh lockfile after dependency range updates
-        if: steps.validate_bounds_test.outcome == 'success' && steps.validate_ranges.outcome == 'success'
-        run: uv lock
-        working-directory: ./python
-
-      - name: Install final dependency set
-        run: uv run poe install
-        working-directory: ./python
-
-      - name: Run final checks
-        run: uv run poe check
-        working-directory: ./python
-
-      - name: Run final typing
-        run: uv run poe typing
-        working-directory: ./python
-
-      - name: Commit and push dependency updates
-        id: commit_updates
-        run: |
-          BRANCH="automation/python-dependency-maintenance"
-
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git checkout -B "${BRANCH}"
-
-          git add python/pyproject.toml python/packages/*/pyproject.toml python/uv.lock
-          if git diff --cached --quiet; then
-            echo "has_changes=false" >> "$GITHUB_OUTPUT"
-            echo "No dependency updates to commit."
-            exit 0
-          fi
-
-          git commit -m "Python: chore: update dependencies"
-          git push --force-with-lease --set-upstream origin "${BRANCH}"
-          echo "has_changes=true" >> "$GITHUB_OUTPUT"
-
-      - name: Create or update dependency maintenance tracking issue
-        if: steps.commit_updates.outputs.has_changes == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const branch = "automation/python-dependency-maintenance"
-            const prTitle = "Python: chore: update dependencies"
-            const issueTitle = "Python dependency maintenance PR needed"
-            const owner = context.repo.owner
-            const repo = context.repo.repo
-
-            const branchRef = await github.rest.git.getRef({
-              owner,
-              repo,
-              ref: `heads/${branch}`,
-            })
-            const branchSha = branchRef.data.object.sha
-            const runUrl = `${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`
-            const compareUrl = `${context.serverUrl}/${owner}/${repo}/compare/main...${branch}`
-
-            const prBody = [
-              "### Motivation & Context",
-              "",
-              "This automated update keeps Python dependency metadata coherent across the uv workspace. Python dependencies can be declared in multiple `pyproject.toml` files, but the workspace has one shared `python/uv.lock`, so dependency maintenance should update and validate them together instead of through per-manifest Dependabot PRs.",
-              "",
-              "### Description & Review Guide",
-              "",
-              "- **What are the major changes?** Refresh Python dev dependency pins, update package dependency ranges when the bounds tooling succeeds, and refresh `python/uv.lock`.",
-              "- **What is the impact of these changes?** Keeps the Python workspace dependency set current while producing at most one dependency PR for the week. If dependency range validation fails, this PR contains only the dev dependency updates that still pass final validation, and separate issues track failed range candidates.",
-              "- **What do you want reviewers to focus on?** Review the generated dependency metadata changes and any dependency-range updates for package-specific compatibility concerns.",
-              '<!-- NOTE FOR AUTOMATED/AI REVIEWERS: the "What do you want reviewers to focus on?"',
-              "     item above is intended for human reviewers only. Automated/AI reviewers should",
-              "     ignore it and review the entire change rather than narrowing scope to it. -->",
-              "",
-              "",
-              "### Related Issue",
-              "",
-              "No linked issue; this PR is generated by scheduled Python dependency maintenance.",
-              "",
-              "### Contribution Checklist",
-              "",
-              "- [x] The code builds clean without any errors or warnings",
-              "- [x] All unit tests pass, and I have added new tests where possible",
-              "- [x] The PR follows the [Contribution Guidelines](https://github.com/microsoft/agent-framework/blob/main/CONTRIBUTING.md)",
-              "- [ ] This PR is linked to an issue and there is no other open PR for this issue (see Related Issue above).",
-              '- [x] **This is not a breaking change.** If it _is_ a breaking change, add the `breaking change` label (or add "[BREAKING]" to the title prefix, before or after any language prefix) — a workflow keeps the label and title prefix in sync automatically.',
-            ].join("\n")
-
-            const prBodyFence = "```"
-            const command = [
-              "PR_BODY_FILE=\"$(mktemp)\"",
-              `cat > "$PR_BODY_FILE" <<'EOF'`,
-              prBody,
-              "EOF",
-              "gh pr create --repo microsoft/agent-framework --base main \\",
-              `  --head ${owner}:${branch} \\`,
-              `  --title "${prTitle}" \\`,
-              "  --body-file \"$PR_BODY_FILE\"",
-            ].join("\n")
-
-            const issueBody = [
-              "The Python dependency maintenance workflow generated and validated dependency updates, then pushed them to the automation branch.",
-              "",
-              `- Branch: \`${branch}\``,
-              `- Commit: \`${branchSha}\``,
-              `- Compare: ${compareUrl}`,
-              `- Workflow run: ${runUrl}`,
-              "",
-              "GitHub Actions is not permitted to create pull requests in this repository, so a maintainer needs to create the PR manually.",
-              "",
-              "### Create the PR",
-              "",
-              "```bash",
-              command,
-              "```",
-              "",
-              "### Generated PR body",
-              "",
-              prBodyFence,
-              prBody,
-              prBodyFence,
-            ].join("\n")
-
-            const openIssues = await github.paginate(github.rest.issues.listForRepo, {
-              owner,
-              repo,
-              state: "open",
-              per_page: 100,
-            })
-            const existingIssue = openIssues.find((issue) => !issue.pull_request && issue.title === issueTitle)
-
-            if (existingIssue) {
-              await github.rest.issues.update({
-                owner,
-                repo,
-                issue_number: existingIssue.number,
-                title: issueTitle,
-                body: issueBody,
-              })
-              core.info(`Updated issue #${existingIssue.number}: ${issueTitle}`)
-            } else {
-              const createdIssue = await github.rest.issues.create({
-                owner,
-                repo,
-                title: issueTitle,
-                body: issueBody,
-              })
-              core.info(`Created issue #${createdIssue.data.number}: ${issueTitle}`)
-            }

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

@@ -0,0 +1,216 @@
+# Probe the highest allowed dependency versions, then open issues/PRs from the passing updates.
+name: Python - Dependency Range Validation
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+env:
+  UV_CACHE_DIR: /tmp/.uv-cache
+
+jobs:
+  dependency-range-validation:
+    name: Dependency Range Validation
+    runs-on: ubuntu-latest
+    env:
+      # For now only run 3.13, if we do encounter situations where there are mismatches between packages and python versions (other then 3.10 and 3.14 which are known to not be able to install everything)
+      # then we will have to reevaluate.
+      UV_PYTHON: "3.13"
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up python and install the project
+        uses: ./.github/actions/python-setup
+        with:
+          python-version: ${{ env.UV_PYTHON }}
+          os: ${{ runner.os }}
+        env:
+          UV_CACHE_DIR: /tmp/.uv-cache
+
+      - name: Run dependency range validation
+        id: validate_ranges
+        # Keep workflow running so we can still publish diagnostics from this run.
+        continue-on-error: true
+        run: uv run poe validate-dependency-bounds-project --mode upper --package "*"
+        working-directory: ./python
+
+      - 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
+        with:
+          name: dependency-range-results
+          path: python/scripts/dependencies/dependency-range-results.json
+          if-no-files-found: warn
+
+      - 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
+        with:
+          script: |
+            const fs = require("fs")
+            const reportPath = "python/scripts/dependencies/dependency-range-results.json"
+
+            if (!fs.existsSync(reportPath)) {
+              core.warning(`No dependency range report found at ${reportPath}`)
+              return
+            }
+
+            const report = JSON.parse(fs.readFileSync(reportPath, "utf8"))
+            const dependencyFailures = []
+
+            for (const packageResult of report.packages ?? []) {
+              for (const dependency of packageResult.dependencies ?? []) {
+                const candidateVersions = new Set(dependency.candidate_versions ?? [])
+                const failedAttempts = (dependency.attempts ?? []).filter(
+                  (attempt) => attempt.status === "failed" && candidateVersions.has(attempt.trial_upper)
+                )
+                if (!failedAttempts.length) {
+                  continue
+                }
+
+                const failuresByVersion = new Map()
+                for (const attempt of failedAttempts) {
+                  const version = attempt.trial_upper || "unknown"
+                  if (!failuresByVersion.has(version)) {
+                    failuresByVersion.set(version, attempt.error || "No error output captured.")
+                  }
+                }
+
+                dependencyFailures.push({
+                  packageName: packageResult.package_name,
+                  projectPath: packageResult.project_path,
+                  dependencyName: dependency.name,
+                  originalRequirements: dependency.original_requirements ?? [],
+                  finalRequirements: dependency.final_requirements ?? [],
+                  failedVersions: [...failuresByVersion.entries()].map(([version, error]) => ({ version, error })),
+                })
+              }
+            }
+
+            if (!dependencyFailures.length) {
+              core.info("No failing dependency candidates found.")
+              return
+            }
+
+            const owner = context.repo.owner
+            const repo = context.repo.repo
+            const openIssues = await github.paginate(github.rest.issues.listForRepo, {
+              owner,
+              repo,
+              state: "open",
+              per_page: 100,
+            })
+            const openIssueTitles = new Set(
+              openIssues.filter((issue) => !issue.pull_request).map((issue) => issue.title)
+            )
+
+            const formatError = (message) => String(message || "No error output captured.").replace(/```/g, "'''")
+
+            for (const failure of dependencyFailures) {
+              const title = `Dependency validation failed: ${failure.dependencyName} (${failure.packageName})`
+              if (openIssueTitles.has(title)) {
+                core.info(`Issue already exists: ${title}`)
+                continue
+              }
+
+              const visibleFailures = failure.failedVersions.slice(0, 5)
+              const omittedCount = failure.failedVersions.length - visibleFailures.length
+              const failureDetails = visibleFailures
+                .map(
+                  (entry) =>
+                    `- \`${entry.version}\`\n\n\`\`\`\n${formatError(entry.error).slice(0, 3500)}\n\`\`\``
+                )
+                .join("\n\n")
+
+              const body = [
+                "Automated dependency range validation found candidate versions that failed checks.",
+                "",
+                `- Package: \`${failure.packageName}\``,
+                `- Project path: \`${failure.projectPath}\``,
+                `- Dependency: \`${failure.dependencyName}\``,
+                `- Original requirements: ${
+                  failure.originalRequirements.length
+                    ? failure.originalRequirements.map((value) => `\`${value}\``).join(", ")
+                    : "_none_"
+                }`,
+                `- Final requirements after run: ${
+                  failure.finalRequirements.length
+                    ? failure.finalRequirements.map((value) => `\`${value}\``).join(", ")
+                    : "_none_"
+                }`,
+                "",
+                "### Failed versions and errors",
+                failureDetails,
+                omittedCount > 0 ? `\n_Additional failed versions omitted: ${omittedCount}_` : "",
+                "",
+                `Workflow run: ${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`,
+              ].join("\n")
+
+              await github.rest.issues.create({
+                owner,
+                repo,
+                title,
+                body,
+              })
+              openIssueTitles.add(title)
+              core.info(`Created issue: ${title}`)
+            }
+
+      - name: Refresh lockfile
+        # Only refresh lockfile after a clean validation to avoid committing known-bad ranges.
+        if: steps.validate_ranges.outcome == 'success'
+        run: uv lock --upgrade
+        working-directory: ./python
+
+      - name: Commit and push dependency updates
+        id: commit_updates
+        if: steps.validate_ranges.outcome == 'success'
+        run: |
+          BRANCH="automation/python-dependency-range-updates"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git checkout -B "${BRANCH}"
+
+          git add python/packages/*/pyproject.toml python/uv.lock
+          if git diff --cached --quiet; then
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            echo "No dependency updates to commit."
+            exit 0
+          fi
+
+          git commit -m "chore: update dependency ranges"
+          git push --force-with-lease --set-upstream origin "${BRANCH}"
+          echo "has_changes=true" >> "$GITHUB_OUTPUT"
+
+      - name: Create or update pull request with GitHub CLI
+        # Only open/update PRs for validated updates to keep automation branches trustworthy.
+        if: steps.validate_ranges.outcome == 'success' && steps.commit_updates.outputs.has_changes == 'true'
+        run: |
+          BRANCH="automation/python-dependency-range-updates"
+          PR_TITLE="Python: chore: update dependency ranges"
+          PR_BODY_FILE="$(mktemp)"
+
+          cat > "${PR_BODY_FILE}" <<'EOF'
+          This PR was generated by the dependency range validation workflow.
+
+          - Ran `uv run poe validate-dependency-bounds-project --mode upper --package "*"`
+          - Updated package dependency bounds
+          - Refreshed `python/uv.lock` with `uv lock --upgrade`
+          EOF
+
+          PR_NUMBER="$(gh pr list --head "${BRANCH}" --base main --state open --json number --jq '.[0].number')"
+          if [ -n "${PR_NUMBER}" ]; then
+            gh pr edit "${PR_NUMBER}" --title "${PR_TITLE}" --body-file "${PR_BODY_FILE}"
+          else
+            gh pr create --base main --head "${BRANCH}" --title "${PR_TITLE}" --body-file "${PR_BODY_FILE}"
+          fi

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

@@ -0,0 +1,91 @@
+name: Python - Dev Dependency Upgrade
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  UV_CACHE_DIR: /tmp/.uv-cache
+
+jobs:
+  upgrade-dev-dependencies:
+    name: Upgrade Dev Dependencies
+    runs-on: ubuntu-latest
+    env:
+      UV_PYTHON: "3.13"
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up python and install the project
+        uses: ./.github/actions/python-setup
+        with:
+          python-version: ${{ env.UV_PYTHON }}
+          os: ${{ runner.os }}
+        env:
+          UV_CACHE_DIR: /tmp/.uv-cache
+
+      - name: Upgrade dev dependencies and validate workspace
+        run: uv run poe upgrade-dev-dependencies
+        working-directory: ./python
+
+      - name: Commit and push dev dependency updates
+        id: commit_updates
+        run: |
+          BRANCH="automation/python-dev-dependency-updates"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git checkout -B "${BRANCH}"
+
+          git add python/pyproject.toml python/packages/*/pyproject.toml python/uv.lock
+          if git diff --cached --quiet; then
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            echo "No dev dependency updates to commit."
+            exit 0
+          fi
+
+          git commit -F- <<'EOF'
+          Python: chore: upgrade dev dependencies
+          EOF
+          git push --force-with-lease --set-upstream origin "${BRANCH}"
+          echo "has_changes=true" >> "$GITHUB_OUTPUT"
+
+      - name: Create or update pull request with GitHub CLI
+        if: steps.commit_updates.outputs.has_changes == 'true'
+        run: |
+          BRANCH="automation/python-dev-dependency-updates"
+          PR_TITLE="Python: chore: upgrade dev dependencies"
+          PR_BODY_FILE="$(mktemp)"
+
+          cat > "${PR_BODY_FILE}" <<'EOF'
+          ### Motivation and Context
+
+          This automated update refreshes Python dev dependency pins across the workspace and reruns the repo validation gates before opening a pull request.
+
+          ### Description
+
+          - Ran `uv run poe upgrade-dev-dependencies`
+          - Refreshed dev dependency pins in workspace `pyproject.toml` files
+          - Refreshed `python/uv.lock` with `uv lock --upgrade`
+          - Reinstalled from the frozen lockfile and reran `check`, `typing`, and `test`
+
+          ### Contribution Checklist
+
+          - [x] The code builds clean without any errors or warnings
+          - [x] The PR follows the [Contribution Guidelines](https://github.com/microsoft/agent-framework/blob/main/CONTRIBUTING.md)
+          - [x] All unit tests pass, and I have added new tests where possible
+          - [ ] **Is this a breaking change?** If yes, add "[BREAKING]" prefix to the title of the PR.
+          EOF
+
+          PR_NUMBER="$(gh pr list --head "${BRANCH}" --base main --state open --json number --jq '.[0].number')"
+          if [ -n "${PR_NUMBER}" ]; then
+            gh pr edit "${PR_NUMBER}" --title "${PR_TITLE}" --body-file "${PR_BODY_FILE}"
+          else
+            gh pr create --base main --head "${BRANCH}" --title "${PR_TITLE}" --body-file "${PR_BODY_FILE}"
+          fi

.github/workflows/python-docs.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: Set up uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
         with:
           version-file: "python/pyproject.toml"
           enable-cache: true

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

@@ -177,7 +177,7 @@ jobs:
         run: curl -fsSL https://ollama.com/install.sh | sh
         working-directory: .
       - name: Cache Ollama models
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: ~/.ollama/models
           key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
@@ -474,45 +474,6 @@ jobs:
           path: ./python/pytest.xml
           if-no-files-found: ignore
 
-  # GitHub Copilot integration tests
-  python-tests-github-copilot:
-    name: Python Integration Tests - GitHub Copilot
-    runs-on: ubuntu-latest
-    environment: integration
-    timeout-minutes: 60
-    env:
-      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-      GITHUB_COPILOT_TIMEOUT: "120"
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          ref: ${{ inputs.checkout-ref }}
-          persist-credentials: false
-      - name: Set up python and install the project
-        id: python-setup
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Test with pytest (GitHub Copilot integration)
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/github_copilot/tests
-          -m integration
-          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-github-copilot
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
   # Integration test trend report (aggregates per-job JUnit XML results)
   python-integration-test-report:
     name: Integration Test Report
@@ -529,7 +490,6 @@ jobs:
         python-tests-foundry,
         python-tests-foundry-hosting,
         python-tests-cosmos,
-        python-tests-github-copilot,
       ]
     runs-on: ubuntu-latest
     defaults:
@@ -546,12 +506,12 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Download all test results from current run
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           pattern: test-results-*
           path: test-results/
       - name: Restore report history cache
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-integration-${{ github.run_id }}
@@ -568,7 +528,7 @@ jobs:
         run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
       - name: Save report history cache
         if: always()
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-integration-${{ github.run_id }}
@@ -593,8 +553,7 @@ jobs:
         python-tests-functions,
         python-tests-foundry,
         python-tests-foundry-hosting,
-        python-tests-cosmos,
-        python-tests-github-copilot
+        python-tests-cosmos
       ]
     steps:
       - name: Fail workflow if tests failed

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

@@ -25,16 +25,12 @@ jobs:
       pythonChanges: ${{ steps.filter.outputs.python}}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
         id: filter
         with:
           filters: |
             python:
               - 'python/**'
-              - '!python/AGENTS.md'
-              - '!python/**/AGENTS.md'
-              - '!python/.github/skills/*'
-              - '!python/.github/skills/**'
       # run only if 'python' files were changed
       - name: python tests
         if: steps.filter.outputs.python == 'true'
@@ -92,6 +88,9 @@ jobs:
       - name: Run lab type checking
         run: cd packages/lab && uv run poe pyright
 
+      - name: Run lab mypy
+        run: cd packages/lab && uv run poe mypy
+
       # Surface failing tests
       - name: Surface failing tests
         if: always()

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

@@ -40,10 +40,9 @@ jobs:
       foundryChanged: ${{ steps.filter.outputs.foundry }}
       foundryHostingChanged: ${{ steps.filter.outputs.foundry_hosting }}
       cosmosChanged: ${{ steps.filter.outputs.cosmos }}
-      githubCopilotChanged: ${{ steps.filter.outputs.github_copilot }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+      - uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
         id: filter
         with:
           filters: |
@@ -86,8 +85,6 @@ jobs:
               - 'python/packages/foundry_hosting/**'
             cosmos:
               - 'python/packages/azure-cosmos/**'
-            github_copilot:
-              - 'python/packages/github_copilot/**'
       # run only if 'python' files were changed
       - name: python tests
         if: steps.filter.outputs.python == 'true'
@@ -298,7 +295,7 @@ jobs:
         run: curl -fsSL https://ollama.com/install.sh | sh
         working-directory: .
       - name: Cache Ollama models
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: ~/.ollama/models
           key: ollama-models-qwen2.5-1.5b-nomic-embed-text-v1
@@ -661,58 +658,6 @@ jobs:
           path: ./python/pytest.xml
           if-no-files-found: ignore
 
-  # GitHub Copilot integration tests
-  python-tests-github-copilot:
-    name: Python Tests - GitHub Copilot Integration
-    needs: paths-filter
-    if: >
-      github.event_name != 'pull_request' &&
-      needs.paths-filter.outputs.pythonChanges == 'true' &&
-      (github.event_name != 'merge_group' ||
-       needs.paths-filter.outputs.githubCopilotChanged == 'true' ||
-       needs.paths-filter.outputs.coreChanged == 'true')
-    runs-on: ubuntu-latest
-    environment: integration
-    timeout-minutes: 60
-    env:
-      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-      GITHUB_COPILOT_TIMEOUT: "120"
-    defaults:
-      run:
-        working-directory: python
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - name: Set up python and install the project
-        id: python-setup
-        uses: ./.github/actions/python-setup
-        with:
-          python-version: ${{ env.UV_PYTHON }}
-          os: ${{ runner.os }}
-      - name: Test with pytest (GitHub Copilot integration)
-        run: >
-          uv run pytest --import-mode=importlib
-          packages/github_copilot/tests
-          -m integration
-          --timeout=120 --session-timeout=900 --timeout_method thread
-          --retries 2 --retry-delay 5
-          --junitxml=pytest.xml
-      - name: Surface failing tests
-        if: always()
-        uses: pmeier/pytest-results-action@20b595761ba9bf89e115e875f8bc863f913bc8ad # v0.7.2
-        with:
-          path: ./python/pytest.xml
-          summary: true
-          display-options: fEX
-          fail-on-empty: false
-          title: GitHub Copilot integration test results
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: test-results-github-copilot
-          path: ./python/pytest.xml
-          if-no-files-found: ignore
-
   # Integration test trend report (aggregates per-job JUnit XML results)
   python-integration-test-report:
     name: Integration Test Report
@@ -729,7 +674,6 @@ jobs:
         python-tests-foundry,
         python-tests-foundry-hosting,
         python-tests-cosmos,
-        python-tests-github-copilot,
       ]
     runs-on: ubuntu-latest
     defaults:
@@ -743,12 +687,12 @@ jobs:
           python-version: ${{ env.UV_PYTHON }}
           os: ${{ runner.os }}
       - name: Download all test results from current run
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           pattern: test-results-*
           path: test-results/
       - name: Restore report history cache
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-merge-${{ github.run_id }}
@@ -765,7 +709,7 @@ jobs:
         run: cat integration-test-report.md >> $GITHUB_STEP_SUMMARY
       - name: Save report history cache
         if: always()
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: python/integration-report-history.json
           key: integration-report-history-merge-${{ github.run_id }}
@@ -791,7 +735,6 @@ jobs:
         python-tests-foundry,
         python-tests-foundry-hosting,
         python-tests-cosmos,
-        python-tests-github-copilot,
       ]
     steps:
       - name: Fail workflow if tests failed

.github/workflows/python-release.yml

@@ -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@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
         with:
           files: |
             python/dist/*

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

@@ -693,7 +693,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Download all validation reports
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
         with:
           pattern: validation-report-*
           path: reports/
@@ -701,7 +701,7 @@ jobs:
 
       - name: Restore validation history
         id: cache-restore
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: validation-history/
           key: validation-history-${{ github.run_id }}
@@ -719,7 +719,7 @@ jobs:
         run: cat trend-report.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Save validation history
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: validation-history/
           key: validation-history-${{ github.run_id }}

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

@@ -8,7 +8,6 @@ on:
 
 permissions:
   contents: read
-  actions: read
   pull-requests: write
 
 jobs:
@@ -24,42 +23,32 @@ jobs:
       - name: Download coverage report
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           run-id: ${{ github.event.workflow_run.id }}
           path: ./python
           merge-multiple: true
       - name: Display structure of downloaded files
         run: ls
-      - name: Read and validate PR number
-        # Keep the artifact handoff aligned with the workflow run that produced it.
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPO: ${{ github.repository }}
-          RUN_HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
+      - name: Read and set PR number
+        # Need to read the PR number from the file saved in the previous workflow
+        # because the workflow_run event does not have access to the PR number
+        # The PR number is needed to post the comment on the PR
         run: |
           if [ ! -s pr_number ]; then
             echo "PR number file 'pr_number' is missing or empty"
             exit 1
           fi
-
-          ARTIFACT_PR_NUMBER=$(cat pr_number)
-          if ! [[ "$ARTIFACT_PR_NUMBER" =~ ^[0-9]+$ ]]; then
-            echo "::error::PR number file contains invalid content"
+          PR_NUMBER=$(head -1 pr_number | tr -dc '0-9')
+          if [ -z "$PR_NUMBER" ]; then
+            echo "PR number file 'pr_number' does not contain a valid PR number"
             exit 1
           fi
-
-          PR_HEAD_SHA=$(gh pr view "$ARTIFACT_PR_NUMBER" --repo "$REPO" --json headRefOid --jq '.headRefOid')
-          if [ "$PR_HEAD_SHA" != "$RUN_HEAD_SHA" ]; then
-            echo "::error::PR head SHA does not match the triggering workflow run"
-            exit 1
-          fi
-
-          echo "PR_NUMBER=$ARTIFACT_PR_NUMBER" >> "$GITHUB_ENV"
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
       - name: Pytest coverage comment
         id: coverageComment
-        uses: MishaKav/pytest-coverage-comment@dd5b80bde6d16941f336518e92929e89069d8451 # v1.7.2
+        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4 # v1.6.0
         with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
           issue-number: ${{ env.PR_NUMBER }}
           pytest-xml-coverage-path: python/python-coverage.xml
           title: "Python Test Coverage Report"

.github/workflows/python-tests.yml

@@ -5,10 +5,6 @@ on:
     branches: ["main", "feature*"]
     paths:
       - "python/**"
-      - "!python/AGENTS.md"
-      - "!python/**/AGENTS.md"
-      - "!python/.github/skills/*"
-      - "!python/.github/skills/**"
 env:
   # Configure a constant location for the uv cache
   UV_CACHE_DIR: /tmp/.uv-cache

.gitignore

@@ -206,7 +206,6 @@ temp*/
 .temp/
 
 # AI
-**/.checkpoints/
 .claude/
 .omc/
 .omx/
@@ -214,7 +213,6 @@ WARP.md
 **/memory-bank/
 **/projectBrief.md
 **/tmpclaude*
-.kiro/
 # Dependency-bound validation reports
 python/scripts/dependency-*-results.json
 python/scripts/dependencies/dependency-*-results.json
@@ -250,4 +248,3 @@ dotnet/filtered-*.slnx
 .omx/
 
 **/issues/
-.test_*

README.md

@@ -6,7 +6,7 @@
 [![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)
+[![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**.

SUPPORT.md

@@ -1,17 +1,17 @@
-# Support
-
-## How to file issues and get help  
-
-This project uses GitHub Issues to track bugs and feature requests. Please search the existing 
-issues before filing new issues to avoid duplicates.  For new issues, file your bug or 
-feature request as a new Issue.
-
-For help and questions about using this project, please create a GitHub issue.
-
-AI Support team will support Microsoft Agent Framework issues for customers under a **Unified support agreement when the issue arises from usage of Azure AI services** (Foundry Models, Foundry Agents etc.) in conjunction with the SDK. Conversely, if customer has any other / non unified support agreement and/or Agent Framework SDK is used in a way **not involving an Azure service**, it is treated as a purely open-source tool – Microsoft’s support organization will not handle it, and users should use GitHub or forums for assistance
-
-For Copilot Studio SDK implementation issues, customers should use GitHub Issues for assistance, as outlined above. Conversely, for prerequisites managed within the Copilot Studio portal, customers can rely on the standard Microsoft Copilot Studio support channels.
-
-## Microsoft Support Policy  
-
-Support for this **PROJECT or PRODUCT** is limited to the resources listed above.
+# Support
+
+## How to file issues and get help  
+
+This project uses GitHub Issues to track bugs and feature requests. Please search the existing 
+issues before filing new issues to avoid duplicates.  For new issues, file your bug or 
+feature request as a new Issue.
+
+For help and questions about using this project, please create a GitHub issue.
+
+AI Support team will support Microsoft Agent Framework issues for customers under a **Unified support agreement when the issue arises from usage of Azure AI services** (Foundry Models, Foundry Agents etc.) in conjunction with the SDK. Conversely, if customer has any other / non unified support agreement and/or Agent Framework SDK is used in a way **not involving an Azure service**, it is treated as a purely open-source tool – Microsoft’s support organization will not handle it, and users should use GitHub or forums for assistance
+
+For Copilot Studio SDK implementation issues, customers should use GitHub Issues for assistance, as outlined above. Conversely, for prerequisites managed within the Copilot Studio portal, customers can rely on the standard Microsoft Copilot Studio support channels.
+
+## Microsoft Support Policy  
+
+Support for this **PROJECT or PRODUCT** is limited to the resources listed above.

TRANSPARENCY_FAQ.md

@@ -2,7 +2,7 @@
 
 **What is Microsoft Agent Framework?**
 
-Microsoft Agent Framework is a comprehensive multi-language (C#/.NET and Python) framework for building, orchestrating, and deploying AI agents and multi-agent workflows. The system takes user instructions and conversation inputs and produces intelligent responses through AI agents that can integrate with various LLM providers (OpenAI, Azure OpenAI, Microsoft Foundry). It provides both simple chat agents and complex multi-agent workflows with graph-based orchestration.
+Microsoft Agent Framework is a comprehensive multi-language (C#/.NET and Python) framework for building, orchestrating, and deploying AI agents and multi-agent workflows. The system takes user instructions and conversation inputs and produces intelligent responses through AI agents that can integrate with various LLM providers (OpenAI, Azure OpenAI, Azure AI Foundry). It provides both simple chat agents and complex multi-agent workflows with graph-based orchestration.
 
 **What can Microsoft Agent Framework do?**
 
@@ -12,7 +12,7 @@ The framework offers:
 - **Multi-Agent Orchestration**: Group chat, sequential, concurrent, and handoff patterns
 - **Graph-based Workflows**: Connect agents and deterministic functions using data flows with streaming, checkpointing, time-travel, and Human-in-the-loop
 - **Extensibility Framework**: Extend with native functions, A2A, Model Context Protocol (MCP)
-- **LLM Integration**: Support for OpenAI, Azure OpenAI, Microsoft Foundry, and other providers
+- **LLM Integration**: Support for OpenAI, Azure OpenAI, Azure AI Foundry, and other providers
 - **Runtime Support**: Both in-process and distributed agent execution
 
 **What is/are Microsoft Agent Framework's intended use(s)?**

declarative-agents/workflow-samples/MathChat.yaml

@@ -11,7 +11,7 @@ trigger:
   kind: OnConversationStart
   id: workflow_demo
   actions:
- 
+
     - kind: InvokeAzureAgent
       id: question_student
       conversationId: =System.ConversationId

docs/assets/SVG/Microsoft Foundry Agent Framework - Color.svg

@@ -1,55 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M163.006 36.0262C155.129 31.4785 145.424 31.4759 137.533 36.0284L104.002 55.3877C107.838 53.2763 112.07 52.2274 116.296 52.2248C120.633 52.2231 124.976 53.3247 128.871 55.5411L174.091 81.6479C175.11 82.2362 175.738 83.3236 175.738 84.5004V151.263C175.738 152.716 177.313 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.7299C209.704 68.6342 204.855 60.227 196.967 55.6697L190.983 52.2141C190.65 52.0008 190.313 51.7921 189.969 51.5933L163.006 36.0262Z" fill="url(#paint0_linear_481_4810)"/>
-<path d="M163.006 36.0262C155.129 31.4785 145.424 31.4759 137.533 36.0284L104.002 55.3877C107.838 53.2763 112.07 52.2274 116.296 52.2248C120.633 52.2231 124.976 53.3247 128.871 55.5411L174.091 81.6479C175.11 82.2362 175.738 83.3236 175.738 84.5004V151.263C175.738 152.716 177.313 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.7299C209.704 68.6342 204.855 60.227 196.967 55.6697L190.983 52.2141C190.65 52.0008 190.313 51.7921 189.969 51.5933L163.006 36.0262Z" fill="url(#paint1_linear_481_4810)"/>
-<path d="M103.548 55.6397L103.557 55.6451L104.002 55.3877C103.851 55.471 103.698 55.5531 103.548 55.6397Z" fill="url(#paint2_linear_481_4810)"/>
-<path d="M103.548 55.6397L103.557 55.6451L104.002 55.3877C103.851 55.471 103.698 55.5531 103.548 55.6397Z" fill="url(#paint3_linear_481_4810)"/>
-<path d="M116.308 52.2209C111.903 52.2271 107.507 53.3498 103.561 55.6366C95.6702 60.1891 90.8239 68.6019 90.8231 77.6986L90.8223 167.846C90.8222 169.786 92.871 171.041 94.599 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9894C124.778 58.6476 129.49 55.9209 133.25 58.0698L128.879 55.5453C124.976 53.3242 120.645 52.2192 116.308 52.2209Z" fill="url(#paint4_linear_481_4810)"/>
-<path d="M95.3068 221.682C103.184 226.23 112.889 226.232 120.78 221.68L154.311 202.32C150.475 204.432 146.243 205.481 142.018 205.483C137.68 205.485 133.337 204.383 129.442 202.167L84.2226 176.06C83.2035 175.472 82.5757 174.384 82.5757 173.208L82.5757 106.445C82.5757 104.992 81 104.087 79.7451 104.813L61.3465 115.428C53.4682 119.976 48.6091 128.382 48.6089 137.487L48.6089 179.978C48.6089 189.074 53.4585 197.481 61.3465 202.038L67.3303 205.494C67.6629 205.707 68.0002 205.916 68.3446 206.115L95.3068 221.682Z" fill="url(#paint5_linear_481_4810)"/>
-<path d="M95.3068 221.682C103.184 226.23 112.889 226.232 120.78 221.68L154.311 202.32C150.475 204.432 146.243 205.481 142.018 205.483C137.68 205.485 133.337 204.383 129.442 202.167L84.2226 176.06C83.2035 175.472 82.5757 174.384 82.5757 173.208L82.5757 106.445C82.5757 104.992 81 104.087 79.7451 104.813L61.3465 115.428C53.4682 119.976 48.6091 128.382 48.6089 137.487L48.6089 179.978C48.6089 189.074 53.4585 197.481 61.3465 202.038L67.3303 205.494C67.6629 205.707 68.0002 205.916 68.3446 206.115L95.3068 221.682Z" fill="url(#paint6_linear_481_4810)"/>
-<path d="M154.765 202.068L154.756 202.063L154.311 202.32C154.463 202.237 154.615 202.155 154.765 202.068Z" fill="url(#paint7_linear_481_4810)"/>
-<path d="M154.765 202.068L154.756 202.063L154.311 202.32C154.463 202.237 154.615 202.155 154.765 202.068Z" fill="url(#paint8_linear_481_4810)"/>
-<path d="M142.003 205.487C146.408 205.481 150.805 204.358 154.751 202.071C162.641 197.519 167.488 189.106 167.488 180.009L167.489 89.8618C167.489 87.9222 165.44 86.667 163.712 87.5479L154.788 92.0972C141.739 98.7494 133.523 112.159 133.523 126.806L133.523 194.719C133.533 199.06 128.821 201.787 125.061 199.638L129.432 202.163C133.336 204.384 137.666 205.489 142.003 205.487Z" fill="url(#paint9_linear_481_4810)"/>
-<defs>
-<linearGradient id="paint0_linear_481_4810" x1="207.413" y1="61.882" x2="148.999" y2="163.067" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint1_linear_481_4810" x1="188.235" y1="204.189" x2="264.21" y2="152.592" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint2_linear_481_4810" x1="207.413" y1="61.882" x2="148.999" y2="163.067" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint3_linear_481_4810" x1="188.235" y1="204.189" x2="264.21" y2="152.592" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint4_linear_481_4810" x1="93.1761" y1="128.826" x2="66.2399" y2="104.746" gradientUnits="userSpaceOnUse">
-<stop offset="0.25" stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#2C08AC"/>
-</linearGradient>
-<linearGradient id="paint5_linear_481_4810" x1="50.9004" y1="195.826" x2="109.315" y2="94.6412" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint6_linear_481_4810" x1="70.0787" y1="53.5188" x2="-5.89657" y2="105.116" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint7_linear_481_4810" x1="50.9004" y1="195.826" x2="109.315" y2="94.6412" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9189F7"/>
-<stop offset="1" stop-color="#4135E9"/>
-</linearGradient>
-<linearGradient id="paint8_linear_481_4810" x1="70.0787" y1="53.5188" x2="-5.89657" y2="105.116" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#7274FF"/>
-</linearGradient>
-<linearGradient id="paint9_linear_481_4810" x1="165.135" y1="128.882" x2="192.072" y2="152.962" gradientUnits="userSpaceOnUse">
-<stop offset="0.25" stop-color="#4F42FD"/>
-<stop offset="1" stop-color="#2C08AC"/>
-</linearGradient>
-</defs>
-</svg>

docs/assets/SVG/Microsoft Foundry Agent Framework - Fill (Black).svg

@@ -1,5 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M167.489 89.8618C167.489 87.9224 165.441 86.667 163.713 87.5473L154.788 92.0971C141.739 98.7493 133.523 112.159 133.523 126.806V194.718C133.533 199.053 128.837 201.777 125.08 199.647L84.2227 176.06C83.2036 175.472 82.5762 174.384 82.5762 173.207V106.445C82.5759 104.992 80.9999 104.087 79.7451 104.813L61.3467 115.428C53.4685 119.976 48.6096 128.382 48.6094 137.487V179.978C48.6094 189.074 53.4588 197.481 61.3467 202.039L67.3301 205.494C67.6627 205.707 68.0004 205.916 68.3447 206.115L95.3066 221.682C103.184 226.23 112.889 226.232 120.779 221.679L154.312 202.32C154.271 202.342 154.23 202.362 154.189 202.384C154.283 202.333 154.375 202.281 154.468 202.229L154.312 202.32C154.463 202.237 154.615 202.154 154.765 202.068L154.762 202.065C162.646 197.511 167.487 189.102 167.488 180.009L167.489 89.8618Z" fill="black"/>
-<path d="M163.007 36.0259C155.13 31.4781 145.424 31.4763 137.533 36.0288L104.002 55.3882C104.029 55.3732 104.057 55.359 104.084 55.3442C104.02 55.3794 103.956 55.4159 103.893 55.4516L104.002 55.3882C103.851 55.4714 103.699 55.5536 103.549 55.6401L103.552 55.6411C95.6664 60.1948 90.8241 68.6053 90.8232 77.6987L90.8223 167.846C90.8223 169.786 92.8707 171.04 94.5986 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9897C124.778 58.6479 129.49 55.9211 133.25 58.0698L174.091 81.6479C175.11 82.2363 175.737 83.3238 175.737 84.5005V151.263C175.738 152.716 177.314 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.73C209.704 68.6343 204.855 60.2267 196.967 55.6694L190.982 52.2143C190.65 52.0011 190.313 51.792 189.969 51.5932L163.007 36.0259Z" fill="black"/>
-</svg>

docs/assets/SVG/Microsoft Foundry Agent Framework - Fill (White).svg

@@ -1,5 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="black"/>
-<path d="M167.489 89.8618C167.489 87.9224 165.441 86.667 163.713 87.5473L154.788 92.0971C141.739 98.7493 133.523 112.159 133.523 126.806V194.718C133.533 199.053 128.837 201.777 125.08 199.647L84.2227 176.06C83.2036 175.472 82.5762 174.384 82.5762 173.207V106.445C82.5759 104.992 80.9999 104.087 79.7451 104.813L61.3467 115.428C53.4685 119.976 48.6096 128.382 48.6094 137.487V179.978C48.6094 189.074 53.4588 197.481 61.3467 202.039L67.3301 205.494C67.6627 205.707 68.0004 205.916 68.3447 206.115L95.3066 221.682C103.184 226.23 112.889 226.232 120.779 221.679L154.312 202.32C154.271 202.342 154.23 202.362 154.189 202.384C154.283 202.333 154.375 202.281 154.468 202.229L154.312 202.32C154.463 202.237 154.615 202.154 154.765 202.068L154.762 202.065C162.646 197.511 167.487 189.102 167.488 180.009L167.489 89.8618Z" fill="white"/>
-<path d="M163.007 36.0259C155.13 31.4781 145.424 31.4763 137.533 36.0288L104.002 55.3882C104.029 55.3732 104.057 55.359 104.084 55.3442C104.02 55.3794 103.956 55.4159 103.893 55.4516L104.002 55.3882C103.851 55.4714 103.699 55.5536 103.549 55.6401L103.552 55.6411C95.6664 60.1948 90.8241 68.6053 90.8232 77.6987L90.8223 167.846C90.8223 169.786 92.8707 171.04 94.5986 170.16L103.523 165.611C116.573 158.959 124.788 145.549 124.788 130.902V62.9897C124.778 58.6479 129.49 55.9211 133.25 58.0698L174.091 81.6479C175.11 82.2363 175.737 83.3238 175.737 84.5005V151.263C175.738 152.716 177.314 153.621 178.568 152.895L196.967 142.28C204.845 137.732 209.704 129.326 209.704 120.221V77.73C209.704 68.6343 204.855 60.2267 196.967 55.6694L190.982 52.2143C190.65 52.0011 190.313 51.792 189.969 51.5932L163.007 36.0259Z" fill="white"/>
-</svg>

docs/assets/SVG/Microsoft Foundry Agent Framework - Stroke (Black).svg

@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="white"/>
-<path d="M48.6094 179.978V137.487C48.6096 128.382 53.4685 119.976 61.3467 115.428L79.7451 104.813C80.9999 104.087 82.5759 104.992 82.5762 106.445V173.207C82.5762 174.384 83.2036 175.472 84.2227 176.06L125.08 199.647C128.837 201.777 133.533 199.053 133.523 194.718V126.806C133.523 112.388 141.484 99.1684 154.18 92.4135L154.788 92.0971L163.713 87.5473C165.441 86.667 167.489 87.9224 167.489 89.8618L167.488 180.009L167.474 180.86C167.181 189.624 162.399 197.653 154.762 202.065L154.765 202.068C154.615 202.154 154.463 202.237 154.312 202.32L154.468 202.229C154.375 202.281 154.283 202.333 154.189 202.384C154.23 202.362 154.271 202.342 154.312 202.32L120.779 221.679L120.034 222.092C112.534 226.093 103.539 226.092 96.0508 222.095L95.3066 221.682L68.3447 206.115C68.0004 205.916 67.6627 205.707 67.3301 205.494L61.3467 202.039C53.7053 197.624 48.9149 189.595 48.623 180.829L48.6094 179.978ZM175.737 84.5005C175.737 83.3974 175.186 82.3728 174.277 81.7641L174.091 81.6479L133.25 58.0698C129.49 55.9211 124.778 58.6479 124.788 62.9897V130.902L124.782 131.587C124.53 145.966 116.369 159.063 103.523 165.611L94.5986 170.16L94.4355 170.236C92.799 170.938 90.9459 169.803 90.8281 168.026L90.8223 167.846L90.8232 77.6987C90.8241 68.6053 95.6664 60.1948 103.552 55.6411L103.549 55.6401C103.699 55.5536 103.851 55.4714 104.002 55.3882L103.893 55.4516C103.956 55.4159 104.02 55.3794 104.084 55.3442C104.057 55.359 104.029 55.3732 104.002 55.3882L137.533 36.0288C145.424 31.4763 155.13 31.4781 163.007 36.0259L189.969 51.5932C190.313 51.792 190.65 52.0011 190.982 52.2143L196.967 55.6694C204.855 60.2267 209.704 68.6343 209.704 77.73V120.221L209.689 121.073C209.397 129.848 204.599 137.874 196.967 142.28L178.568 152.895C177.314 153.621 175.738 152.716 175.737 151.263V84.5005ZM176.814 149.866L176.819 149.864L176.832 149.856C176.826 149.859 176.82 149.862 176.814 149.866ZM137.023 194.71L137.019 195.038C136.802 201.878 129.341 206.087 123.354 202.692L123.33 202.678L82.4727 179.091C80.3698 177.877 79.0762 175.634 79.0762 173.207V109.239L63.0957 118.458C56.5124 122.259 52.3745 129.183 52.1221 136.752L52.1094 137.487V179.978C52.1094 187.823 56.2909 195.075 63.0957 199.007H63.0967L69.0801 202.462L69.1504 202.503L69.2188 202.547C69.5212 202.741 69.8111 202.92 70.0947 203.083L97.0566 218.651L97.6982 219.007C104.372 222.569 112.434 222.453 119.029 218.648L152.514 199.316L152.512 199.312C152.581 199.274 152.65 199.236 152.752 199.178L152.753 199.181C152.775 199.169 152.796 199.158 152.815 199.147L153.011 199.035C159.81 195.107 163.987 187.854 163.988 180.009V91.3344L156.378 95.2153C144.501 101.27 137.023 113.475 137.023 126.806V194.71ZM94.3223 166.372L101.934 162.493C113.811 156.438 121.288 144.233 121.288 130.902V62.9897C121.278 55.9521 128.901 51.5532 134.986 55.0307L135 55.0385L175.841 78.6167L176.036 78.7339C178.023 79.9714 179.237 82.15 179.237 84.5005V148.468L195.217 139.249C202.013 135.326 206.204 128.075 206.204 120.221V77.73C206.204 69.8848 202.022 62.6318 195.217 58.6997L189.232 55.2456L189.162 55.2046L189.094 55.1606C188.788 54.9649 188.5 54.787 188.219 54.6245L161.257 39.0571C154.463 35.135 146.091 35.1311 139.282 39.0591L139.283 39.06L105.765 58.4106L105.767 58.4135C105.713 58.443 105.723 58.4383 105.602 58.5063L105.6 58.5034C105.535 58.5391 105.481 58.5691 105.433 58.5962L105.302 58.6723C98.5016 62.5995 94.324 69.8532 94.3232 77.6987L94.3223 166.372Z" fill="black"/>
-</svg>

docs/assets/SVG/Microsoft Foundry Agent Framework - Stroke (White).svg

@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" transform="matrix(-1 0 0 1 256 0)" fill="black"/>
-<path d="M48.6094 179.978V137.487C48.6096 128.382 53.4685 119.976 61.3467 115.428L79.7451 104.813C80.9999 104.087 82.5759 104.992 82.5762 106.445V173.207C82.5762 174.384 83.2036 175.472 84.2227 176.06L125.08 199.647C128.837 201.777 133.533 199.053 133.523 194.718V126.806C133.523 112.388 141.484 99.1684 154.18 92.4135L154.788 92.0971L163.713 87.5473C165.441 86.667 167.489 87.9224 167.489 89.8618L167.488 180.009L167.474 180.86C167.181 189.624 162.399 197.653 154.762 202.065L154.765 202.068C154.615 202.154 154.463 202.237 154.312 202.32L154.468 202.229C154.375 202.281 154.283 202.333 154.189 202.384C154.23 202.362 154.271 202.342 154.312 202.32L120.779 221.679L120.034 222.092C112.534 226.093 103.539 226.092 96.0508 222.095L95.3066 221.682L68.3447 206.115C68.0004 205.916 67.6627 205.707 67.3301 205.494L61.3467 202.039C53.7053 197.624 48.9149 189.595 48.623 180.829L48.6094 179.978ZM175.737 84.5005C175.737 83.3974 175.186 82.3728 174.277 81.7641L174.091 81.6479L133.25 58.0698C129.49 55.9211 124.778 58.6479 124.788 62.9897V130.902L124.782 131.587C124.53 145.966 116.369 159.063 103.523 165.611L94.5986 170.16L94.4355 170.236C92.799 170.938 90.9459 169.803 90.8281 168.026L90.8223 167.846L90.8232 77.6987C90.8241 68.6053 95.6664 60.1948 103.552 55.6411L103.549 55.6401C103.699 55.5536 103.851 55.4714 104.002 55.3882L103.893 55.4516C103.956 55.4159 104.02 55.3794 104.084 55.3442C104.057 55.359 104.029 55.3732 104.002 55.3882L137.533 36.0288C145.424 31.4763 155.13 31.4781 163.007 36.0259L189.969 51.5932C190.313 51.792 190.65 52.0011 190.982 52.2143L196.967 55.6694C204.855 60.2267 209.704 68.6343 209.704 77.73V120.221L209.689 121.073C209.397 129.848 204.599 137.874 196.967 142.28L178.568 152.895C177.314 153.621 175.738 152.716 175.737 151.263V84.5005ZM176.814 149.866L176.819 149.864L176.832 149.856C176.826 149.859 176.82 149.862 176.814 149.866ZM137.023 194.71L137.019 195.038C136.802 201.878 129.341 206.087 123.354 202.692L123.33 202.678L82.4727 179.091C80.3698 177.877 79.0762 175.634 79.0762 173.207V109.239L63.0957 118.458C56.5124 122.259 52.3745 129.183 52.1221 136.752L52.1094 137.487V179.978C52.1094 187.823 56.2909 195.075 63.0957 199.007H63.0967L69.0801 202.462L69.1504 202.503L69.2188 202.547C69.5212 202.741 69.8111 202.92 70.0947 203.083L97.0566 218.651L97.6982 219.007C104.372 222.569 112.434 222.453 119.029 218.648L152.514 199.316L152.512 199.312C152.581 199.274 152.65 199.236 152.752 199.178L152.753 199.181C152.775 199.169 152.796 199.158 152.815 199.147L153.011 199.035C159.81 195.107 163.987 187.854 163.988 180.009V91.3344L156.378 95.2153C144.501 101.27 137.023 113.475 137.023 126.806V194.71ZM94.3223 166.372L101.934 162.493C113.811 156.438 121.288 144.233 121.288 130.902V62.9897C121.278 55.9521 128.901 51.5532 134.986 55.0307L135 55.0385L175.841 78.6167L176.036 78.7339C178.023 79.9714 179.237 82.15 179.237 84.5005V148.468L195.217 139.249C202.013 135.326 206.204 128.075 206.204 120.221V77.73C206.204 69.8848 202.022 62.6318 195.217 58.6997L189.232 55.2456L189.162 55.2046L189.094 55.1606C188.788 54.9649 188.5 54.787 188.219 54.6245L161.257 39.0571C154.463 35.135 146.091 35.1311 139.282 39.0591L139.283 39.06L105.765 58.4106L105.767 58.4135C105.713 58.443 105.723 58.4383 105.602 58.5063L105.6 58.5034C105.535 58.5391 105.481 58.5691 105.433 58.5962L105.302 58.6723C98.5016 62.5995 94.324 69.8532 94.3232 77.6987L94.3223 166.372Z" fill="white"/>
-</svg>

docs/decisions/0001-agent-run-response.md

@@ -2,7 +2,7 @@
 # These are optional elements. Feel free to remove any of them.
 status: accepted
 contact: westey-m
-date: 2025-07-10
+date: 2025-07-10 {YYYY-MM-DD when the decision was last updated}
 deciders: sergeymenshykh, markwallace, rbarreto, dmytrostruk, westey-m, eavanvalkenburg, stephentoub
 consulted:
 informed:
@@ -139,7 +139,7 @@ Therefore something like `AgentResponse.Text` which also aggregates all `TextCon
 
 #### Option 1.2 Presence of Secondary Content is determined by a runtime parameter
 
-We can allow callers to choose whether to include secondary content in the list of response messages.
+We can allow callers to choose whether to include secondary content in the list of reponse messages.
 Open Question: Do we allow secondary content to use `TextContent` types?
 
 ```csharp

docs/decisions/0002-agent-tools.md

@@ -113,7 +113,7 @@ Implement a hybrid strategy where common tools use generic `AITool`-derived abst
 
 ### AI Agent Tool Types Availability
 
-Tool Type | Microsoft Foundry Agent Service | OpenAI Assistant API | OpenAI ChatCompletion API | OpenAI Responses API | Amazon Bedrock Agents | Google | Anthropic | Description
+Tool Type | Azure AI Foundry Agent Service | OpenAI Assistant API | OpenAI ChatCompletion API | OpenAI Responses API | Amazon Bedrock Agents | Google | Anthropic | Description
 -- | -- | -- | -- | -- | -- | -- | -- | --
 Function Calling | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | Enables custom, stateless functions to define specific agent behaviors.
 Code Interpreter | ✅ | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | Allows agents to execute code for tasks like data analysis or problem-solving.
@@ -132,7 +132,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Function Calling
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/function-calling?pivots=rest">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/function-calling?pivots=rest</a>
 
   Message Request:
@@ -401,7 +401,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Code Interpreter
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   <p>Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/code-interpreter-samples?pivots=rest-api">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/code-interpreter-samples?pivots=rest-api</a></p>
 
   <p>.NET Support: ✅</p>
@@ -709,7 +709,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Search and Retrieval
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/file-search-upload-files?pivots=rest">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/file-search-upload-files?pivots=rest</a>
 
   File Search Request:
@@ -1083,7 +1083,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Web Search
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/bing-code-samples?pivots=rest">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/bing-code-samples?pivots=rest</a>
 
   Bing Search Message Request:
@@ -1630,7 +1630,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### OpenAPI Spec Tool
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/openapi-spec-samples?pivots=rest-api">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/openapi-spec-samples?pivots=rest-api</a><br>
   Source: <a href="https://learn.microsoft.com/en-us/rest/api/aifoundry/aiagents/run-steps/get-run-step?view=rest-aifoundry-aiagents-v1&tabs=HTTP#runstepopenapitoolcall">https://learn.microsoft.com/en-us/rest/api/aifoundry/aiagents/run-steps/get-run-step?view=rest-aifoundry-aiagents-v1&tabs=HTTP#runstepopenapitoolcall</a>
 
@@ -1712,7 +1712,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Stateful Functions
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/azure-functions-samples?pivots=rest">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/azure-functions-samples?pivots=rest</a>
 
   Message Request:
@@ -1832,7 +1832,7 @@ Image Generation | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Generates or edits
 
 #### Microsoft Fabric
 <details>
-  <summary>Microsoft Foundry Agent Service</summary>
+  <summary>Azure AI Foundry Agent Service</summary>
   Source: <a href="https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/fabric?pivots=rest">https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/fabric?pivots=rest</a>
 
   Message Request:

docs/decisions/0006-userapproval.md

@@ -2,7 +2,7 @@
 # These are optional elements. Feel free to remove any of them.
 status: accepted
 contact: westey-m
-date: 2025-09-12
+date: 2025-09-12 {YYYY-MM-DD when the decision was last updated}
 deciders: sergeymenshykh, markwallace-microsoft, rogerbarreto, dmytrostruk, westey-m, eavanvalkenburg, stephentoub, peterychang
 consulted: 
 informed: 
@@ -25,7 +25,7 @@ See various features that would need to be supported via this type of mechanism,
 - Also see [the openai human-in-the-loop guide](https://openai.github.io/openai-agents-js/guides/human-in-the-loop/#approval-requests).
 - Also see [the openai MCP guide](https://openai.github.io/openai-agents-js/guides/mcp/#optional-approval-flow).
 - Also see [MCP Approval Requests from OpenAI](https://platform.openai.com/docs/guides/tools-remote-mcp#approvals).
-- Also see [Microsoft Foundry MCP Approvals](https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/model-context-protocol-samples?pivots=rest#submit-your-approval).
+- Also see [Azure AI Foundry MCP Approvals](https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/tools/model-context-protocol-samples?pivots=rest#submit-your-approval).
 - Also see [MCP Elicitation requests](https://modelcontextprotocol.io/specification/draft/client/elicitation)
 
 ## Decision Drivers

docs/decisions/0007-agent-filtering-middleware.md

@@ -1125,7 +1125,7 @@ Naming (Python): N/A (Composable Components)
 Supports: N  
 Observation: No explicit middleware/filters; modularity allows composable units but no dedicated interception hooks or callbacks for custom reading/modification mid-execution.
 
-No specific code examples available for interception.
+For more details, see the official documentation: [Atomic Agents Docs](https://brainblend-ai.github.io/atomic-agents/). No specific code examples available for interception.
 
 #### Smolagents (Hugging Face)
 

docs/decisions/0009-support-long-running-operations.md

@@ -57,7 +57,7 @@ This section describes different options for various aspects required to add lon
 
 ### 1. Methods for Working with Long-Running Operations
 
-Based on the analysis of existing APIs that support long-running operations (such as OpenAI Responses, Microsoft Foundry Agents, and A2A),
+Based on the analysis of existing APIs that support long-running operations (such as OpenAI Responses, Azure AI Foundry Agents, and A2A), 
 the following operations are used for working with long-running operations:
 - Common operations:
   - **Start Long-Running Execution**: Initiates a long-running operation and returns its Id.
@@ -757,7 +757,7 @@ Some of them natively support resuming streaming from a specific point in the st
 | API                     | Can Resume Streaming                 | Model                                                                                                      |
 |-------------------------|--------------------------------------|------------------------------------------------------------------------------------------------------------|
 | OpenAI Responses        | Yes                                  | StreamingResponseUpdate.**SequenceNumber** + GetResponseStreamingAsync(responseId, **startingAfter**, ct)  |
-| Microsoft Foundry Agents | Emulated<sup>2</sup>                 | RunStep.**Id** + custom pseudo code: client.Runs.GetRunStepsAsync(...).AllStepsAfter(**stepId**)           |
+| Azure AI Foundry Agents | Emulated<sup>2</sup>                 | RunStep.**Id** + custom pseudo code: client.Runs.GetRunStepsAsync(...).AllStepsAfter(**stepId**)           |
 | A2A                     | Implementation dependent<sup>1</sup> |          																				                  |
 
 <sup>1</sup> The [A2A specification](https://github.com/a2aproject/A2A/blob/main/docs/topics/streaming-and-async.md#1-streaming-with-server-sent-events-sse)
@@ -765,7 +765,7 @@ allows an A2A agent implementation to decide how to handle streaming resumption:
 a task is still active (and the server hasn't sent a final: true event for that phase), the client can attempt to reconnect to the stream using the tasks/resubscribe RPC method. 
 The server's behavior regarding missed events during the disconnection period (e.g., whether it backfills or only sends new updates) is implementation-dependent._
 
-<sup>2</sup> The Microsoft Foundry Agents API has an API to start a streaming run but does not have an API to resume streaming from a specific point in the stream.
+<sup>2</sup> The Azure AI Foundry Agents API has an API to start a streaming run but does not have an API to resume streaming from a specific point in the stream.
 However, it has non-streaming APIs to access already started runs, which can be used to emulate streaming resumption by accessing a run and its steps and streaming all the steps after a specific step.
 
 #### Required Changes
@@ -828,7 +828,7 @@ Sequence of updates from OpenAI Responses API to answer the question "What time
 | resp_2 | 10 | resp.output_item.done    | -               | InProgress                |                                                   |
 | resp_2 | 11 | resp.completed           | Completed       | Completed                 |                                                   |
 
-Sequence of updates from Microsoft Foundry Agents API to answer the question "What time is it?" using a function call:
+Sequence of updates from Azure AI Foundry Agents API to answer the question "What time is it?" using a function call:
 | Id     | SN      | UpdateKind        | Run.Status     | Step.Status | Message.Status  | ChatResponseUpdate.Status | Description                                       |
 |--------|---------|-------------------|----------------|-------------|-----------------|---------------------------|---------------------------------------------------|
 | run_1  | -       | RunCreated        | Queued         | -           | -               | Queued                    |                                                   |
@@ -852,7 +852,7 @@ Sequence of updates from Microsoft Foundry Agents API to answer the question "Wh
 
 To support long-running operations, the following values need to be returned by the GetResponseAsync and GetStreamingResponseAsync methods:
 - `ResponseId` - identifier of the long-running operation or an entity representing it, such as a task.
-- `ConversationId` - identifier of the conversation or thread the long-running operation is part of. Some APIs, like Microsoft Foundry Agents, use
+- `ConversationId` - identifier of the conversation or thread the long-running operation is part of. Some APIs, like Azure AI Foundry Agents, use 
   this identifier together with the ResponseId to identify a run.
 - `SequenceNumber` - identifier of an update within a stream of updates. This is required to support streaming resumption by the GetStreamingResponseAsync method only.
 - `Status` - status of the long-running operation: whether it is queued, running, failed, cancelled, completed, etc.
@@ -1089,7 +1089,7 @@ public class ChatOptions
 
 ##### 6.1.5 Continuation Token of a Custom Type
 
-The option is similar to the "6.1.3 Continuation Token of System.ClientModel.ContinuationToken Type" option but suggests using a 
+The option is similar the the "6.1.3 Continuation Token of System.ClientModel.ContinuationToken Type" option but suggests using a 
 custom type for the continuation token instead of the `System.ClientModel.ContinuationToken` type.
 
 **Pros**
@@ -1203,7 +1203,7 @@ response = await agent.CancelRunAsync(response.ResponseId, new AgentCancelRunOpt
 In case an agent supports either or both cancellation and deletion of long-running operations, it will override the corresponding methods.
 Otherwise, it won't override them, and the base implementations will return null by default.
 
-Some agents, for example Microsoft Foundry Agents, require the thread identifier to cancel a run. To accommodate this requirement, the `CancelRunAsync` method
+Some agents, for example Azure AI Foundry Agents, require the thread identifier to cancel a run. To accommodate this requirement, the `CancelRunAsync` method
 accepts an optional `AgentCancelRunOptions` parameter that allows callers to specify the thread associated with the run they want to cancel.
 
 ```csharp
@@ -1574,7 +1574,7 @@ the thread is provided with background operations consistently for all runs.
 </details>
 
 <details>
-<summary>Microsoft Foundry Agents</summary>
+<summary>Azure AI Foundry Agents</summary>
 
 - Create a thread and run the agent against it and wait for it to complete using polling:
     ```csharp

docs/decisions/0021-provider-leading-clients.md

@@ -34,11 +34,11 @@ Key changes:
 1. **New `agent-framework-openai` package** with dependencies on `agent-framework-core`, `openai`, and `packaging` only.
 2. **Class renames**: `OpenAIResponsesClient` → `OpenAIChatClient` (Responses API), `OpenAIChatClient` → `OpenAIChatCompletionClient` (Chat Completions API). Old names remain as deprecated aliases.
 3. **Deprecated classes**: `OpenAIAssistantsClient`, all `AzureOpenAI*Client` classes, `AzureAIClient`, `AzureAIAgentClient`, and `AzureAIProjectAgentProvider` are marked deprecated.
-4. **New `FoundryChatClient`** in azure-ai for Microsoft Foundry Responses API access, built on `RawFoundryChatClient(RawOpenAIChatClient)`.
+4. **New `FoundryChatClient`** in azure-ai for Azure AI Foundry Responses API access, built on `RawFoundryChatClient(RawOpenAIChatClient)`.
 5. **All deprecated `AzureOpenAI*` classes** consolidated into a single file (`_deprecated_azure_openai.py`) in the azure-ai package for clean future deletion.
 6. **Core's `agent_framework.openai` and `agent_framework.azure` namespaces** become lazy-loading gateways, preserving backward-compatible import paths while removing hard dependencies.
 7. **Unified `model` parameter** replaces `model_id` (OpenAI), `deployment_name` (Azure OpenAI), and `model_deployment_name` (Azure AI) across all client constructors. The term `model` is intentionally generic: it naturally maps to an OpenAI model name *and* to an Azure OpenAI deployment name, making it straightforward to use `OpenAIChatClient` with either OpenAI or Azure OpenAI backends (via `AsyncAzureOpenAI`). Environment variables are similarly unified (e.g., `OPENAI_MODEL` instead of separate `OPENAI_CHAT_MODEL_ID` / `OPENAI_CHAT_COMPLETION_MODEL_ID`).
-8. **`FoundryAgent`** replaces the pattern of `Agent(client=AzureAIClient(...))` for connecting to pre-configured agents in Microsoft Foundry (PromptAgents and HostedAgents). The underlying `RawFoundryAgentChatClient` is an implementation detail — most users interact only with `FoundryAgent`. `AzureAIAgentClient` is separately deprecated as it refers to the V1 Agents Service API. See below for design rationale.
+8. **`FoundryAgent`** replaces the pattern of `Agent(client=AzureAIClient(...))` for connecting to pre-configured agents in Azure AI Foundry (PromptAgents and HostedAgents). The underlying `RawFoundryAgentChatClient` is an implementation detail — most users interact only with `FoundryAgent`. `AzureAIAgentClient` is separately deprecated as it refers to the V1 Agents Service API. See below for design rationale.
 
 ### Foundry Agent Design: `FoundryAgentClient` vs `FoundryAgent`
 

docs/decisions/0023-foundry-evals-integration.md

@@ -7,11 +7,11 @@ consulted: Pratyush Mishra, Shivam Shrivastava, Manni Arora (Centrica eval scena
 informed: Agent Framework team, Foundry Evals team
 ---
 
-# Agent Evaluation Architecture with Microsoft Foundry Integration
+# Agent Evaluation Architecture with Azure AI Foundry Integration
 
 ## Context and Problem Statement
 
-Microsoft Foundry provides a rich evaluation service for AI agents — built-in evaluators for agent behavior (task adherence, intent resolution), tool usage (tool call accuracy, tool selection), quality (coherence, fluency, relevance), and safety (violence, self-harm, prohibited actions). Results are viewable in the Foundry portal with dashboards and comparison views.
+Azure AI Foundry provides a rich evaluation service for AI agents — built-in evaluators for agent behavior (task adherence, intent resolution), tool usage (tool call accuracy, tool selection), quality (coherence, fluency, relevance), and safety (violence, self-harm, prohibited actions). Results are viewable in the Foundry portal with dashboards and comparison views.
 
 However, using Foundry Evals with an agent-framework agent today requires significant manual effort. Developers must:
 
@@ -445,7 +445,7 @@ These factorings produce different scores for the same conversation. The framewo
 
 ### Azure AI: FoundryEvals
 
-`Evaluator` implementation backed by Microsoft Foundry:
+`Evaluator` implementation backed by Azure AI Foundry:
 
 ```python
 class FoundryEvals:
@@ -812,4 +812,4 @@ public sealed class EvalItem
 
 ## More Information
 
-- [Foundry Evals documentation](https://learn.microsoft.com/azure/ai-foundry/concepts/evaluation-approach-gen-ai) — Microsoft Foundry evaluation overview
+- [Foundry Evals documentation](https://learn.microsoft.com/azure/ai-foundry/concepts/evaluation-approach-gen-ai) — Azure AI Foundry evaluation overview

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

@@ -43,11 +43,6 @@ FIDES (Flow Integrity Deterministic Enforcement System) is a label-based securit
 3. **Variable Indirection** — `ContentVariableStore` and `VariableReferenceContent` for physical isolation of untrusted content from the LLM context.
 4. **Quarantined Execution** — `quarantined_llm` and `inspect_variable` tools for isolated processing of untrusted data with audit logging.
 
-In addition, remote MCP integrations are secured through two mechanisms:
-
-- **Hint-based tool auto-labeling**: MCP `ToolAnnotations` (`readOnlyHint`, `openWorldHint`, etc.) are mapped to FIDES tool properties (`source_integrity`, `accepts_untrusted`, `max_allowed_confidentiality`).
-- **Server `_meta.ifc` result labels**: MCP result metadata is parsed into per-item `security_label` values, so provider-supplied IFC labels are enforced by middleware.
-
 ### Consequences
 
 - Good, because it provides deterministic security guarantees about what untrusted content can influence.
@@ -122,13 +117,6 @@ Monitor agent behavior and block suspicious actions post-facto.
 - Uses existing `FunctionMiddleware` base class.
 - Attaches labels via `additional_properties` (no schema changes).
 - Leverages `SerializationMixin` for label persistence.
-- Integrates MCP hint/result metadata through `additional_properties` keys (`max_allowed_confidentiality`, `source_integrity`, `__mcp_result_meta__`) without transport-specific policy code in core middleware.
-
-### MCP-Specific Security Notes
-
-- `SecureMCPToolProxy` applies `apply_mcp_security_labels(...)` automatically when connecting an MCP tool or URL.
-- For servers like the GitHub MCP server (with `X-MCP-Features: ifc_labels`), `_meta.ifc` labels are considered authoritative for per-result label assignment.
-- Tools that are not explicitly `readOnlyHint=True` are treated as potential sinks and default to `max_allowed_confidentiality=PUBLIC` to prevent exfiltration.
 
 
 ### Backwards Compatibility

docs/decisions/0025-foundry-toolbox-support.md

@@ -9,7 +9,7 @@ deciders: evmattso
 
 ## What is the goal of this feature?
 
-Enable Agent Framework users to consume Foundry **toolboxes** — named, versioned bundles of tool definitions stored server-side in a Microsoft Foundry project — directly from `FoundryChatClient`, without dropping to the raw `azure-ai-projects` SDK.
+Enable Agent Framework users to consume Foundry **toolboxes** — named, versioned bundles of tool definitions stored server-side in an Azure AI Foundry project — directly from `FoundryChatClient`, without dropping to the raw `azure-ai-projects` SDK.
 
 A user who has configured a toolbox in the Foundry portal (or via the raw SDK) should be able to load it into an agent with a single call:
 

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

@@ -1,7 +1,7 @@
 ---
-status: superseded by [ADR-0030](0030-hosted-platform-context-agentserver-2.0.md)
+status: accepted
 contact: rogerbarreto
-date: 2026-06-29
+date: 2026-05-07
 deciders: rogerbarreto
 consulted: []
 informed: []
@@ -9,8 +9,6 @@ informed: []
 
 # Hosted session identity context for Foundry Hosting
 
-> **Superseded by [ADR-0030](0030-hosted-platform-context-agentserver-2.0.md).** `Azure.AI.AgentServer.*` 2.0.0 (responses protocol `2.0.0`) replaced `ResponseContext.Isolation` (`UserIsolationKey` / `ChatIsolationKey`, headers `x-agent-user-isolation-key` / `x-agent-chat-isolation-key`) with `ResponseContext.PlatformContext` (`UserIdKey` / `CallId`, headers `x-agent-user-id` / `x-agent-foundry-call-id`). The chat isolation key was removed and `HostedSessionContext` is now user-only. This ADR is retained as the historical record of the original design.
-
 ## 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.

docs/decisions/0027-hosting-channels.md

@@ -1,518 +0,0 @@
----
-status: accepted
-contact: eavanvalkenburg
-date: 2026-06-30
-deciders: eavanvalkenburg
-consulted: rogerbarreto, moonbox3
----
-
-# Python protocol helpers and optional execution state
-
-## Context and Problem Statement
-
-Agent Framework needs to help applications expose agents and workflows over external protocols such as OpenAI
-Responses, Telegram, Activity Protocol, and future transports.
-
-FastAPI, Starlette, Azure Functions, Django, Telegram SDKs, Bot Framework SDKs, and other app frameworks already own
-route registration, dependency injection, middleware, authentication, background tasks, lifecycle, and native client
-calls. Agent Framework should not duplicate those surfaces unless a specific hosting environment requires it.
-
-## Decision Drivers
-
-- Keep the released surface small enough to explain without first teaching a channel framework.
-- Provide reusable Agent Framework run translation that works with FastAPI, Django, and other web frameworks.
-- Let app/framework code own route declaration, auth, middleware, native SDK clients, command handling, and background
-  work.
-- Keep stateful execution support explicit: session lookup/storage and workflow checkpoint lookup/storage may still need
-  a small AF-owned home.
-
-## Considered Options
-
-1. Create protocol-specific hosts.
-2. Ship a full host/channel framework with route contribution and channel hooks.
-3. Ship protocol conversion helpers plus optional execution state.
-
-### 1. Create protocol-specific hosts
-
-- Good: no new shared abstraction.
-- Neutral: each protocol host can evolve independently.
-- Bad: every package reinvents AF input/result mapping, session-key conventions, and stateful execution helpers.
-
-### 2. Ship a full host/channel framework
-
-- Good: one object can assemble routes, channels, session handling, hooks, and lifecycle callbacks.
-- Good: app code using the supported host shape can be short.
-- Bad: the framework owns concerns already handled by web frameworks, protocol SDKs and/or other services.
-- Bad: users must understand `Channel`, contribution, hook, and host-dispatch concepts before they can see how a request
-  becomes `agent.run(...)`.
-- Bad: the abstraction is hard to reuse outside the chosen web framework.
-
-### 3. Ship protocol helpers plus optional execution state
-
-- Good: protocol packages provide the Agent Framework run value directly: `<protocol>_to_run(...)` and
-  `<protocol>_from_run(...)` style helpers.
-- Good: apps keep native FastAPI, Starlette, Azure Functions, Django, Bot Framework, or Telegram SDK code.
-- Good: helper functions can be tested without a web framework app or host pipeline.
-- Good: small state objects can still own target-coupled state: `AgentState` pairs an agent target with a `SessionStore`,
-  and `WorkflowState` resolves a workflow target while reusing the existing `CheckpointStorage` abstraction.
-- Good: provides maximum configurability in handling input and outputs (outside of the conversions)
-- Bad: building a first iteration of a new Host is more verbose.
-- Bad: samples show more explicit route/client code than a fully assembled channel host.
-
-## Decision Outcome
-
-Chosen option: **3. Ship protocol helpers plus optional execution state**.
-
-Protocol packages own:
-
-- parsing protocol-native input into Agent Framework run input and options;
-- rendering `AgentResponse`, `AgentResponseUpdate`, workflow results, or workflow updates back into protocol-native
-  response/event payloads;
-- protocol-specific isolation/session id helper functions when useful, such as `telegram_session_id(update)`;
-- protocol-specific typing/update event helpers where the protocol has a native concept.
-
-Application or web-framework code owns:
-
-- HTTP route declaration and route grouping;
-- dependency injection;
-- authentication and authorization;
-- middleware;
-- background tasks and webhook acknowledgement policy;
-- native protocol SDK clients and outbound calls;
-- command registration and command dispatch;
-- request/response status codes and framework-specific error handling;
-- choosing the isolation/session id source for the current deployment and route.
-
-The application builder can make the server exactly as they see fit, but this is outside the responsibilities of this proposed scheme.
-This might include implementing other known API surfaces from vendors like OpenAI, such as creating conversations, vector stores, deleting things, etc.
-If they want they can build the full OpenAI API, but it will include code that does not rely on agent-framework-hosting, which is fine.
-They are responsible for what they expose.
-
-The optional execution-state helpers, if provided, are limited to shared execution state:
-
-- `AgentState`: one `SupportsAgentRun`-compatible target plus a `SessionStore`;
-- `WorkflowState`: one `Workflow`, `WorkflowBuilder`-shaped builder, orchestration builder, or workflow factory;
-- `SessionStore`: plain async storage (`get` / `set` / `delete`) by an app-selected id.
-
-The store does not create sessions. `AgentState` provides the target-aware `get_or_create_session(...)` helper because
-only the state object has both the store and the resolved agent target. Workflow checkpointing should use the existing
-`CheckpointStorage` abstraction directly; app/state code may keep a small cursor (`session_id -> checkpoint_id`) when it
-needs to resume a workflow for a session.
-
-These objects are **not** app objects, channel registries, or route owners. They do not own FastAPI/Starlette setup,
-route contribution, protocol dispatch, command projection, or native SDK calls.
-
-### Helper naming and families
-
-Helpers should be protocol-specific, not generic. Avoid a generic `protocol_to_run(...)` name in public samples because it
-hides the protocol-specific contract behind a second abstraction.
-
-Protocol packages should consider these helper families. This table is a set of examples, not a required protocol or
-checklist. Not every protocol needs every helper, but when a protocol has the concept the naming should stay consistent:
-
-| Helper family | Shape | Purpose |
-| --- | --- | --- |
-| Run conversion | `<protocol>_to_run(...)` | Convert one protocol-native call/update/request into `Agent.run` or `Workflow.run` values. |
-| Final rendering | `<protocol>_from_run(...)` | Convert a final `AgentResponse` / workflow result into protocol-native response payloads or operations. |
-| Stream rendering | `<protocol>_from_streaming_run(...)` | Convert `ResponseStream` / workflow updates into protocol-native events or operations. |
-| Session id extraction | `<protocol>_session_id(...)` | Extract the protocol's natural continuation/partition key from the call, if present. |
-| Command/action parsing | `<protocol>_command(...)` | Parse a protocol-native command/action/operation name without deciding app policy. |
-
-Examples:
-
-- `responses_to_run(...)`, `responses_from_run(...)`, `responses_from_streaming_run(...)`,
-  `responses_session_id(...)`;
-- `telegram_to_run(...)`, `telegram_from_run(...)`, `telegram_from_streaming_run(...)`,
-  `telegram_session_id(...)`, `telegram_command(...)`;
-- `activity_to_run(...)`, `activity_from_run(...)`, `activity_session_id(...)`, `activity_command(...)`;
-- `discord_to_run(...)`, `discord_from_run(...)`, `discord_session_id(...)`, `discord_command(...)`.
-
-The app still owns what a parsed command means. For example, a Telegram `/new`, Discord slash command, Bot Framework
-command activity, or A2A cancellation/request action may parse through a command/action helper, but the route or SDK
-handler decides whether that command clears a session, cancels a task, calls an agent, or is ignored.
-
-Additional helper functions can be protocol-specific when the concept is not broadly shared. Examples include
-`telegram_chat_id(...)`, `telegram_callback_query_id(...)`, `telegram_media_file_id(...)`,
-`discord_interaction_id(...)`, `a2a_task_id(...)`, `a2a_context_id(...)`, and MCP tool/prompt/resource helpers. These
-helpers should still stay side-effect-free: they extract, normalize, or describe protocol data, while app/native SDK code
-performs acknowledgements, sends/edits messages, resolves protected file URLs, applies rate limits, and registers
-handlers.
-
-### Security responsibilities for application builders
-
-The application builder owns the trust boundary. Protocol helper packages can parse native payloads and expose candidate
-ids or operations, but they do not authenticate callers, authorize access to state, or decide which side effects are
-allowed.
-
-Application code that uses these helpers are responsible for (this means that we advice you to think through these topics,
-but ultimately, the choice of which controls are needed for the intended use case is up to the application builder):
-
-- authenticate the caller through the app's normal mechanism before using protocol-provided ids;
-- authorize any caller-supplied session, checkpoint, task, context, conversation, thread, or response id before loading
-  state for it;
-- bind externally supplied ids to the authenticated user, tenant, workspace, installation, or chat context before using
-  them as `SessionStore` keys or checkpoint cursor keys;
-- treat `<protocol>_session_id(...)` results as untrusted candidate keys until that ownership check has passed;
-- keep platform-provided isolation helpers fail-closed outside their trusted hosting environment;
-- authorize command/action effects such as reset, cancel, approve, submit, or tool invocation after parsing them;
-- opt in explicitly before resolving protected media/resource/file URLs and passing them to a remote model provider;
-- persist post-run session or checkpoint state only after `agent.run(...)`, `workflow.run(...)`, or stream finalization has
-  updated that state.
-
-For Foundry specifically, helpers may read values established by Foundry hosting middleware, but must not treat raw
-request headers as trusted Foundry isolation when the app is running outside Foundry. Implementations must test that
-non-Foundry requests do not accept spoofable isolation headers as platform-provided keys.
-
-For workflow checkpointing, the checkpoint boundary must be at least as specific as the authorized session/tenant
-boundary. A shared storage lookup such as "latest checkpoint for workflow name" is safe only when the storage is already
-scoped to the authorized session. In a shared durable store, map the authorized `session_id` to a checkpoint id or other
-cursor and load that specific checkpoint.
-
-### Session continuity
-
-Session continuity remains explicit. Run parsing and isolation/session id selection are separate operations because
-isolation can come from more than one source:
-
-- protocol input, such as OpenAI Responses `previous_response_id`, a Telegram chat id, or an Activity conversation id;
-- running environment, such as Foundry Hosted Agents user/chat isolation context;
-- app-specific trusted middleware or route state.
-
-The app chooses which helper to call for that route and deployment. For example:
-
-- `responses_session_id(body)` from `agent-framework-hosting-responses`, which can return either a `resp_*` previous
-  response id or a `conv_*` conversation id when present;
-- `telegram_session_id(update, bot_id=...)` from `agent-framework-hosting-telegram`, which uses the bot and sender for
-  private chats and the bot and chat for shared group sessions;
-- `activity_session_id(activity)`, `discord_session_id(interaction_or_message)`, or
-  `a2a_session_id(request_context)` from their respective protocol packages;
-- `foundry_user_isolation_key()` or `foundry_chat_isolation_key()` from `agent-framework-foundry-hosting`.
-
-Keep these helpers outside `responses_to_run(...)`, `telegram_to_run(...)`, and other run-input parsers. That makes the
-trust boundary visible: using a request-derived key is a different decision than using a platform-provided isolation key.
-
-The application builder is also responsible for deciding whether the hosting environment is **persistent** (for example,
-a long-running container or web app) or **transient** (for example, Azure Functions, Foundry Hosted Agents, or any
-environment where process memory is not a reliable continuity boundary). That decision controls which state mechanisms are
-safe to use:
-
-- persistent single-process apps may use in-memory state for local development or simple deployments, while still needing
-  durable state for multi-replica continuity;
-- transient apps must not rely on in-memory `SessionStore` state between calls and need a durable session store or a
-  service-owned continuation id;
-- workflow hosts must choose an explicit `CheckpointStorage` and, when they need per-session resume, a durable
-  `session_id -> checkpoint_id` cursor because in-process workflow state and in-memory checkpoint cursors do not survive
-  transient execution.
-
-A `SessionStore` stores `session_id -> AgentSession`, but it does not create sessions. `AgentState` resolves the agent
-target and creates the session on first use:
-
-For agent targets:
-
-```python
-session = await state.get_or_create_session(session_id)
-target = await state.get_target()
-result = await target.run(messages, session=session, options=options)
-```
-
-If the protocol mints a new continuation id as part of the response being created (for example, OpenAI Responses
-`resp_*` ids), store the **post-run** session explicitly under that new id:
-
-```python
-session = await state.get_or_create_session(previous_response_id)
-target = await state.get_target()
-result = await target.run(messages, session=session, options=options)
-await state.set_session(response_id, session)
-```
-
-`agent.run(...)` may update the session object (for example, with service continuation state), so the explicit store call
-belongs after the run, not before it.
-
-The session id is a partition key, not proof of identity. App or platform code must authenticate and authorize any
-externally supplied key before using it.
-
-### Workflow checkpoints
-
-Workflow checkpointing is execution state, not protocol state. `WorkflowState` pairs a workflow target with checkpoint
-state, but it should not wrap or replace the existing `CheckpointStorage` abstraction. Apps should pass the actual
-`CheckpointStorage` they want the workflow to use. If an app needs per-session resume, it can keep a small cursor from
-authorized `session_id` to `checkpoint_id` (or an equivalent store-specific resume token).
-
-Workflow runs do not currently emit a checkpoint id on `WorkflowRunResult` or normal workflow events by default. The
-runner receives checkpoint ids internally from `CheckpointStorage.save(...)`. App/state code that owns the storage can
-observe the latest id by querying the storage after a run, for example
-`await storage.get_latest(workflow_name=target.name)`.
-
-For workflow targets, app code adapts the protocol helper output into the workflow's expected input and invokes the
-workflow through the state object's target:
-
-```python
-# session_id must already be authenticated and authorized for this caller
-target = await state.get_target()
-result = await target.run(message=workflow_input, checkpoint_storage=checkpoint_storage)
-latest = await checkpoint_storage.get_latest(workflow_name=target.name)
-if latest is not None:
-    await checkpoint_cursor_store.set(session_id, latest.checkpoint_id)
-```
-
-If a route wants to resume from a prior checkpoint, it explicitly chooses the checkpoint and passes it to
-`workflow.run(...)`:
-
-```python
-# session_id must already be authenticated and authorized for this caller
-target = await state.get_target()
-checkpoint_id = await checkpoint_cursor_store.get(session_id)
-if checkpoint_id is None:
-    result = await target.run(message=workflow_input, checkpoint_storage=checkpoint_storage)
-else:
-    result = await target.run(checkpoint_id=checkpoint_id, checkpoint_storage=checkpoint_storage)
-latest = await checkpoint_storage.get_latest(workflow_name=target.name)
-if latest is not None:
-    await checkpoint_cursor_store.set(session_id, latest.checkpoint_id)
-```
-
-`workflow.run(...)` writes checkpoints to the provided storage, so storage selection must be explicit at the route layer.
-Protocol helper packages should not own checkpoint layout, route lifecycle, or durable execution.
-
-## Non-goals for v1
-
-The following remain outside the v1 protocol-helper contract. Some are deliberately app-owned in v1; others are possible
-future framework work only after a separate design.
-
-### App-owned in v1
-
-The app builder owns these concerns with normal web-framework, SDK, platform, or application code:
-
-- authentication, authorization policy, and allowlists;
-- deciding whether identities across protocols map to the same `session_id`;
-- non-originating sends using native SDK clients;
-- background work, durable execution, retry, and replay when app code owns the work;
-- routing between multiple agents.
-
-This is easier in the protocol-helper model than it was in the host/channel model: app code already owns the native SDK
-clients, route handlers, authenticated caller context, session id selection, and outbound send calls. An app can link
-channels by choosing the same authorized `session_id` for multiple protocols, and can do non-originating delivery by
-calling the destination protocol's native client directly. That does not make a reusable framework feature safe by
-default; it just means the app-specific version no longer has to fight a host abstraction.
-
-### Future framework work
-
-The following require a reviewed identity, storage, delivery, replay, and observability model before becoming reusable
-framework features:
-
-- reusable cross-channel identity linking;
-- framework-owned proactive or non-originating delivery;
-- fan-out, multicast, selected-channel, active-channel, or all-linked delivery;
-- framework-owned delivery observability, dead-letter handling, and replay semantics;
-- cross-channel confidentiality and link policy.
-
-These possible framework enhancements are tracked by [ADR-0028](0028-hosting-linking-multicast-enhancements.md). They are
-not prerequisites for shipping or using the v1 protocol-helper surface. ADR-0028 was written against the earlier
-host/channel framing and must be revised to align with this protocol-helper and execution-state boundary before those
-enhancements are implemented.
-
-## Consequences
-
-Positive:
-
-- The released surface is smaller and easier to inspect: helpers plus state, not a channel framework.
-- Protocol helpers can be used from FastAPI, Starlette, Azure Functions, Django, CLI tools, tests, or native SDK webhook
-  handlers.
-- App authors can use the authentication, dependency injection, lifecycle, and background-task tools they already know.
-- Session continuity stays explicit and debuggable.
-- Workflow checkpointing can still be centralized if needed without making protocol packages own routing.
-
-Negative:
-
-- Multi-protocol samples include explicit route/client code.
-- Apps that want a batteries-included ASGI app must write or depend on an app-specific wrapper.
-- Existing unreleased code and docs that mention channels, contribution, or hooks must be revised before release.
-
-## More Information
-
-- Follow-up linking and multicast ADR: [ADR-0028](0028-hosting-linking-multicast-enhancements.md). That ADR still uses
-  some earlier host/channel terminology and must be aligned before implementation work starts.
-
-## Appendix: Developer experience sketch
-
-The examples below are sketches, not runtime-ready sample code. They show the minimum shape a developer would need to
-build: where protocol helpers are called, where app-owned auth/authorization belongs, where state is loaded/stored, and
-where native framework code remains in charge.
-
-### Optional execution state
-
-`AgentState` and `WorkflowState` stay small: they are target-specific state holders, not app hosts.
-
-```python
-from typing import Protocol
-
-from agent_framework import AgentSession, SupportsAgentRun, Workflow
-
-
-class SupportsBuild(Protocol):
-    def build(self) -> Workflow: ...
-
-
-class SessionStore:
-    async def get(self, session_id: str) -> AgentSession | None: ...
-    async def set(self, session_id: str, session: AgentSession) -> None: ...
-    async def delete(self, session_id: str) -> None: ...
-
-
-class CheckpointCursorStore:
-    async def get(self, session_id: str) -> str | None: ...
-    async def set(self, session_id: str, checkpoint_id: str) -> None: ...
-    async def delete(self, session_id: str) -> None: ...
-
-
-class AgentState:
-    def __init__(self, target: SupportsAgentRun, *, session_store: SessionStore | None = None) -> None: ...
-    async def get_target(self) -> SupportsAgentRun: ...
-    async def get_or_create_session(self, session_id: str) -> AgentSession: ...
-    async def set_session(self, session_id: str, session: AgentSession) -> None: ...
-
-
-class WorkflowState:
-    def __init__(self, target: Workflow | SupportsBuild) -> None: ...
-    async def get_target(self) -> Workflow: ...
-```
-
-`WorkflowState` accepts direct `Workflow` instances, workflow factories, and builder-shaped objects with
-`build() -> Workflow`. That structurally covers `WorkflowBuilder` and the builders in `agent_framework_orchestrations`
-without making `agent-framework-hosting` depend on the orchestration package.
-
-### Responses-only route
-
-This sketch shows the intended Responses-only shape. The protocol package owns the Agent Framework run conversion helpers and
-response-id minting details; the application owns FastAPI routing, auth, policy adjustment, and response construction.
-
-```python
-import os
-from collections.abc import AsyncIterator
-
-from agent_framework import Agent, ResponseStream
-from agent_framework.openai import OpenAIChatClient
-from agent_framework_hosting import AgentState  # pyright: ignore[reportAttributeAccessIssue]
-from agent_framework_hosting_responses import create_response_id, responses_from_run, responses_from_streaming_run, responses_session_id, responses_to_run  # pyright: ignore[reportAttributeAccessIssue]
-from fastapi import Body, FastAPI, Header, HTTPException
-from fastapi.responses import JSONResponse, StreamingResponse
-
-app = FastAPI()
-agent = Agent(
-    client=OpenAIChatClient(),
-    name="Assistant",
-    instructions="Be concise and helpful.",
-)
-state = AgentState(agent)
-
-
-@app.post("/responses")
-async def responses(body: dict = Body(...), x_api_key: str | None = Header(default=None)) -> JSONResponse | StreamingResponse:
-    if x_api_key != os.environ["RESPONSES_API_KEY"]:
-        raise HTTPException(status_code=401, detail="bad api key")
-
-    # parse the request body into a set of AF objects
-    run = responses_to_run(body)
-    # get the candidate session id from the body
-    # can be a resp_* for previous_response_id or a conv_* for a conversation
-    candidate_session_id = responses_session_id(body)
-    # create a new response_id for this run
-    response_id = create_response_id()
-
-    # the developer can make any adjustments to the request, i.e.:
-    run["options"]["store"] = False
-    run["options"].pop("model", None)
-    # the options here are of the shape defined by the ChatClient/Agent
-
-    # load the session (or create a new one) - this is optional
-    # verify this caller owns candidate_session_id before loading it; API-key auth
-    # alone does not prove ownership of a caller-supplied resp_* or conv_* id
-    session_id = candidate_session_id or response_id
-    session = await state.get_or_create_session(session_id)
-    target = await state.get_target()
-
-    if run["stream"]:
-        stream = target.run(
-            run["messages"],
-            stream=True,
-            session=session,
-            options=run["options"],
-        )
-        async def stream_events() -> AsyncIterator[str]:
-            async for event in responses_from_streaming_run(
-                stream,
-                response_id=response_id,
-                session_id=candidate_session_id,
-            ):
-                yield event
-            # agent.run may update the session during stream finalization, so store the post-run session explicitly
-            await state.set_session(response_id, session)
-
-        return StreamingResponse(stream_events(), media_type="text/event-stream")
-
-    result = await target.run(
-        run["messages"],
-        session=session,
-        options=run["options"],
-    )
-    # agent.run may update the session, so store the post-run session explicitly under the response id
-    # this might also be skipped, if the app chooses to respect `store=False` policy
-    await state.set_session(response_id, session)
-    return JSONResponse(responses_from_run(result, response_id=response_id, session_id=candidate_session_id))
-
-```
-
-### Responses-only Django class-based view
-
-The same helper surface can be used without FastAPI. A Django app owns URL routing, CSRF/auth policy, request parsing,
-and `JsonResponse` construction. In a real Django project this would live in the app's normal view module (for example
-`assistant/views.py`) and be routed from that app's `urls.py`; Django discovers it through its standard project/app
-layout, not through Agent Framework. This sketch shows the non-streaming path only; the streaming branch is the same
-state/finalization pattern shown in the FastAPI sketch and is omitted here to avoid duplicating it.
-
-```python
-import json
-import os
-
-from agent_framework import Agent
-from agent_framework.openai import OpenAIChatClient
-from agent_framework_hosting import AgentState  # pyright: ignore[reportAttributeAccessIssue]
-from agent_framework_hosting_responses import create_response_id, responses_from_run, responses_session_id, responses_to_run  # pyright: ignore[reportAttributeAccessIssue]
-from django.http import HttpRequest, HttpResponseBadRequest, HttpResponseForbidden, JsonResponse
-from django.views import View
-
-
-agent = Agent(
-    client=OpenAIChatClient(),
-    name="Assistant",
-    instructions="Be concise and helpful.",
-)
-state = AgentState(agent)
-
-
-class ResponsesView(View):
-    async def post(self, request: HttpRequest) -> JsonResponse:
-        if request.headers.get("x-api-key") != os.environ["RESPONSES_API_KEY"]:
-            return HttpResponseForbidden("bad api key")
-
-        try:
-            body = json.loads(request.body)
-        except json.JSONDecodeError:
-            return HttpResponseBadRequest("invalid json")
-
-        run = responses_to_run(body)
-        candidate_session_id = responses_session_id(body)
-        response_id = create_response_id()
-        options = run["options"]
-        # verify this caller owns candidate_session_id before loading it; API-key auth
-        # alone does not prove ownership of a caller-supplied resp_* or conv_* id
-        session_id = candidate_session_id or response_id
-        session = await state.get_or_create_session(session_id)
-        target = await state.get_target()
-        result = await target.run(
-            run["messages"],
-            session=session,
-            options=options,
-        )
-        await state.set_session(response_id, session)
-        return JsonResponse(responses_from_run(result, response_id=response_id, session_id=candidate_session_id))
-```

docs/decisions/0028-hosting-linking-multicast-enhancements.md

@@ -1,132 +0,0 @@
----
-status: proposed
-contact: eavanvalkenburg
-date: 2026-06-11
-deciders: eavanvalkenburg
----
-
-# Hosting linking and multicast enhancements
-
-## Context and Problem Statement
-
-[ADR-0027](0027-hosting-channels.md) defines the minimal v1 hosting core: originating-channel responses, explicit `ChannelSession.isolation_key`, and no host-level identity linking, push, multicast, background delivery, or durable runners.
-
-This ADR tracks the richer cross-channel behaviors that were removed from v1. These enhancements are **follow-up work** and are **not prerequisites** for shipping, using, or stabilizing the v1 host/channel core.
-
-## Decision Drivers
-
-- Cross-channel continuity must not create accidental cross-user, cross-tenant, or cross-channel data leaks.
-- Non-originating delivery must be observable, idempotent, retryable, and supportable.
-- Protocol payloads must remain channel-native while still being safe to persist and replay.
-- App authors need opt-in policy controls, not hidden defaults.
-- The enhancement stack should layer on top of the v1 host without reshaping the minimal channel contract.
-
-## Enhancement Areas
-
-The follow-up design should cover these capabilities together because they share identity, storage, delivery, and replay concerns:
-
-- **Cross-channel identity linking** — a user can connect multiple `ChannelIdentity` values to one channel-neutral `isolation_key`.
-- **Authorization and allowlist policy** — channels or hosts can require verified identity, allow specific native identities or claims, and deny unknown callers.
-- **Non-originating response delivery** — a run can respond somewhere other than the request's originating protocol when explicitly configured.
-- **Active-channel routing** — delivery can target the most recently observed linked channel for an `isolation_key`.
-- **Multicast / all-linked delivery** — delivery can fan out to every linked channel or a selected set.
-- **Background runs and continuation tokens** — long-running requests can return immediately and complete later, with a polling/status fallback.
-- **Durable delivery runners** — delivery work can survive process restarts and support dead-letter handling.
-- **Retry and replay semantics** — delivery attempts are bounded, deduplicated, and safe to replay.
-- **Payload serialization** — channel-specific payloads can be persisted, redacted, versioned, and reconstructed without losing protocol fidelity.
-
-Candidate API names from the broader design (`IdentityLinker`, `IdentityAllowlist`, `AuthPolicy`, `ResponseTarget`, `ChannelPush`, `ChannelPushCodec`, `DurableTaskRunner`, `InProcessTaskRunner`, `RetryPolicy`, `LinkPolicy`) remain design vocabulary for this ADR. They are not approved v1 APIs.
-
-## Considered Options
-
-### Option A — Leave all behavior to applications
-
-Applications implement linking, authorization, push, retry, and serialization independently.
-
-- Good: the hosting core stays very small.
-- Neutral: advanced apps can still build what they need.
-- Bad: every app must solve the same security and delivery problems, likely inconsistently.
-
-### Option B — Add the full enhancement stack to v1
-
-The first host release includes linking, authorization, active channel, multicast, background runs, durable runners, and codecs.
-
-- Good: the original cross-channel experience is available immediately.
-- Neutral: samples can demonstrate rich end-to-end flows.
-- Bad: v1 becomes security-sensitive, storage-heavy, and harder to stabilize.
-
-### Option C — Layer opt-in enhancement packages after v1
-
-Ship the minimal host first, then add linking, authorization, and delivery packages behind explicit configuration.
-
-- Good: v1 remains simple while leaving room for a reviewed, supportable enhancement stack.
-- Neutral: apps that need advanced delivery wait for follow-up packages.
-- Bad: the first release does not satisfy proactive or all-linked scenarios.
-
-### Option D — Build only platform-specific integrations
-
-Implement linking and proactive delivery separately in Telegram, Activity Protocol, Discord, and future channels.
-
-- Good: each package can match its protocol exactly.
-- Neutral: some shared abstractions may emerge later.
-- Bad: cross-channel behavior becomes fragmented and hard to reason about.
-
-## Decision Outcome
-
-Proposed direction: **Option C — layered opt-in enhancement packages after v1**.
-
-The minimal host remains the foundation. Follow-up packages may add linking, authorization, delivery, and durable execution, but must be explicitly enabled and must pass the validation gates below before becoming part of the public contract.
-
-## Safety Requirements
-
-### Threat model
-
-The design must account for:
-
-- spoofed channel-native identities,
-- stolen or replayed link challenges,
-- cross-tenant or cross-confidentiality data leakage,
-- unsolicited proactive messages,
-- malicious payloads persisted for replay,
-- denial-of-service through fan-out or retry storms, and
-- privacy leakage through logs, metrics, or support tooling.
-
-Required mitigations include verified identity claims where available, signed and expiring link challenges, explicit user consent, per-channel capability checks, default-deny policy options, tenant partitioning, and uninformative denial messages on shared channels.
-
-### Idempotency and replay
-
-Exactly-once delivery is not a realistic guarantee. The design must provide:
-
-- stable run, continuation, and delivery-attempt identifiers,
-- channel-level idempotency keys where protocols support them,
-- bounded retry with jitter and explicit terminal states,
-- replay windows and expiration,
-- duplicate suppression for persisted attempts, and
-- clear semantics for "delivered", "accepted by platform", and "observed by user".
-
-### Storage
-
-Enhancement storage must stay distinct from v1 `AgentSession` history and workflow checkpoints unless an implementation deliberately backs them with the same physical store.
-
-Stored data should be schema-versioned, minimized, encrypted or otherwise protected as appropriate, and partitioned by tenant/project. Link records, continuation records, active-channel state, delivery attempts, dead letters, and serialized payloads need independent TTL and deletion policies.
-
-### Observability and support
-
-The design must include structured logs, traces, and metrics for link attempts, authorization decisions, delivery scheduling, retries, replay, and dead-letter outcomes. Logs must avoid message content and sensitive identity claims by default. Operators need a way to inspect, revoke, replay, or purge stuck records safely.
-
-## Validation Gates
-
-Before these enhancements are accepted:
-
-- A reviewed threat model covers identity linking, authorization, non-originating delivery, multicast, and replay.
-- Cross-channel linking tests prove a verified identity can link two channels and that unlink/deny paths do not leak information.
-- Authorization tests cover native-id allowlists, verified-claim allowlists, default-deny behavior, and misconfiguration failures.
-- Delivery tests cover originating-only, specific-channel, active-channel, selected-channel, and all-linked routing.
-- Background/continuation tests cover polling fallback, cancellation or expiration, process restart, retry, and dead-letter behavior.
-- Codec tests prove payloads are versioned, redacted where needed, backward compatible, and rejected safely when unknown.
-- Multicast tests prove fan-out is bounded, independently retried, and idempotent per destination.
-- Observability tests or manual validation prove support operators can correlate a request to delivery attempts without exposing sensitive content.
-
-## Relationship to ADR-0027
-
-ADR-0027 remains valid without any of these enhancements. This ADR extends the hosting model only after the safety, storage, and support requirements above are satisfied.

docs/decisions/0029-mcp-skill-templates-and-direct-references.md

@@ -1,641 +0,0 @@
----
-status: proposed
-contact: sergeymenshykh
-date: 2026-06-23
-deciders: sergeymenshykh
----
-
-# Skills Over MCP: Implementation Design Options
-
-This document explores design options for two SEP-2640 features. The decisions are not yet finalized.
-
-- **Part 1: MCP Resource Template Skills** - skills described by a URI template with variables that must be resolved before loading.
-- **Part 2: Direct Skill References** - reading `skill://` URIs referenced directly (e.g., in server instructions) without being listed in the index.
-
-## Part 1: MCP Resource Template Skills
-
-### Context and Problem Statement
-
-The `AgentMcpSkillsSource` currently only supports `skill-md` type entries from `skill://index.json` (support for `archive` type is planned). The SEP-2640 specification also defines `mcp-resource-template` entries: **parameterized skill namespaces** described by a URI template with variables (e.g., `{product}`) that resolve to concrete `SKILL.md` URIs. Rather than materializing every skill in the index, the template's variables must be resolved before a skill can be loaded.
-
-### Index Entry Format
-
-```json
-{
-  "$schema": "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
-  "skills": [
-    {
-      "name": "git-workflow",
-      "type": "skill-md",
-      "description": "Follow this team's Git conventions for branching and commits",
-      "url": "skill://git-workflow/SKILL.md"
-    },
-    {
-      "type": "mcp-resource-template",
-      "description": "Per-product documentation skill",
-      "url": "skill://docs/{product}/SKILL.md"
-    }
-  ]
-}
-```
-
-Key differences from `skill-md`:
-
-| Field | `skill-md` | `mcp-resource-template` |
-|-------|------------|-------------------------|
-| `name` | Required (the skill name) | **Omitted** (represents many skills) |
-| `type` | `"skill-md"` | `"mcp-resource-template"` |
-| `url` | Concrete URI to `SKILL.md` | URI template with variables |
-| `description` | Describes the skill | Describes the addressable skill space |
-
-### Use Cases
-
-Template skills address two scenarios where listing concrete skills is impractical:
-
-- **Large skill catalogs** - too many skills to enumerate every entry in the index.
-- **Dynamically generated skills** - skill content generated on the fly from parameters, so the set of valid skills is not known at index-creation time.
-
-### How Template Skills Are Consumed
-
-Per SEP-2640, the consumption flow relies on the MCP `completion/complete` method:
-
-1. **Server registers a resource template** - The MCP server registers the same `url` value (e.g., `skill://docs/{product}/SKILL.md`) as an MCP [resource template](https://modelcontextprotocol.io/specification/2025-11-25/server/resources#resource-templates), wiring template variables to the [completion API](https://modelcontextprotocol.io/specification/2025-11-25/server/utilities/completion).
-
-2. **Host reads `skill://index.json`** - Discovers the template entry with `type: "mcp-resource-template"`.
-
-3. **Host surfaces template in UI** - Presents the template as an interactive discovery point where the user fills in variables.
-
-4. **Host calls `completion/complete`** - For each template variable (e.g., `{product}`), the host calls the MCP completion API to get possible values from the server:
-   ```json
-   {
-     "method": "completion/complete",
-     "params": {
-       "ref": {
-         "type": "ref/resource",
-         "uri": "skill://docs/{product}/SKILL.md"
-       },
-       "argument": {
-         "name": "product",
-         "value": ""
-       }
-     }
-   }
-   ```
-   The server responds with possible completions:
-   ```json
-   {
-     "completion": {
-       "values": ["widgets", "billing", "auth", "payments"],
-       "hasMore": false,
-       "total": 4
-     }
-   }
-   ```
-
-5. **User selects a value** - The user picks a value (e.g., `"billing"`) from the list.
-
-6. **Host resolves the URI** - The template `skill://docs/{product}/SKILL.md` becomes the concrete URI `skill://docs/billing/SKILL.md`.
-
-7. **Host reads the resolved skill** - Calls `resources/read` with the concrete URI and proceeds as with any `skill-md` skill.
-
-### Potential Implementation Options
-
-### Option 1: Callback on `AgentMcpSkillsSource` for Variable Value Selection
-
-Add a callback to `AgentMcpSkillsSource` (or its options) that is invoked for each `mcp-resource-template` entry to let the caller select variable values.
-
-**Flow:**
-
-1. `AgentMcpSkillsSource.GetSkillsAsync()` reads `skill://index.json`
-2. For each entry with `type: "mcp-resource-template"`:
-   - Parse the URI template to extract variable names (e.g., `{product}`)
-   - Call the MCP `completion/complete` API to get possible values for each variable
-   - Invoke the caller-provided callback with the variable name, description, and possible values
-   - The callback returns a selected value and a `bool` indicating whether to include the skill
-3. Resolve the URI template with the selected values
-4. Create an `AgentMcpSkill` from the resolved URI and add it to the skills list
-
-**API sketch:**
-
-```csharp
-public delegate Task<(string? SelectedValue, bool IncludeSkill)> McpTemplateVariableSelector(
-    string templateDescription,
-    string variableName,
-    IReadOnlyList<string> possibleValues,
-    CancellationToken cancellationToken);
-
-// Usage via builder:
-var provider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(mcpClient, options => {
-        options.TemplateVariableSelector = async (description, variable, values, ct) =>
-        {
-            // Present to user, return selection
-            var selected = PromptUser(variable, values);
-            return (selected, IncludeSkill: selected is not null);
-        };
-    })
-    .Build();
-```
-
-**Pros:**
-- Simple implementation
-- Easy to understand and use
-
-**Cons:**
-- Cannot be used in server-side scenarios where there is no interactive user at skill-discovery time
-- Does not integrate with the agent's conversational flow
-
----
-
-### Option 2: Integrate into Agent Conversation via `ChatClientAgent` Decorator
-
-Model the template variable resolution as a request/response interaction within the agent's conversational loop.
-
-**Flow:**
-
-1. A `DelegatingAIAgent` decorator (e.g., `McpTemplateSkillResolutionAgent`) intercepts `RunAsync`/`RunStreamingAsync` calls and checks whether the inner agent has an `AgentSkillsProvider` with an `AgentMcpSkillsSource` containing unresolved template entries. The check is performed via `GetService<AgentMcpSkillsSource>()` on the `AgentSkillsProvider`, which delegates to a `GetService` method on the `AgentSkillsSource` base class.
-
-2. The decorator calls an internal member on `AgentMcpSkillsSource` to get the list of `mcp-resource-template` entries from the index. The `AgentMcpSkillsSource` needs to be extended with an internal member that exposes unresolved template entries separately from concrete skills.
-
-3. For each template entry, the decorator calls an internal member on `AgentMcpSkillsSource` to retrieve possible values for the template's variables via the MCP `completion/complete` API.
-
-4. For each variable needing resolution, the decorator returns an `McpResourceTemplateValueRequestContent` (inherits from MEAI's `InputRequestContent`) in the agent response - bypassing the call to the inner agent. The content carries the template description, variable name, and possible values.
-
-5. The user app receives the response, identifies the `McpResourceTemplateValueRequestContent` content type, and displays UI to the user showing the variable name and possible values, or forwards it further downstream if the user app is a service.
-
-6. The user selects a value, and the user app calls the agent again with a corresponding `McpResourceTemplateValueResponseContent` (inherits from MEAI's `InputResponseContent`) containing the selected value. The `RequestId` property (inherited from the base classes) correlates the response with the original request.
-
-7. The decorator identifies the response content and provides the resolved values to `AgentMcpSkillsSource` so it can use them when constructing concrete skills.
-
-8. Having resolved all template variables, the decorator calls `RunAsync`/`RunStreamingAsync` on the inner agent.
-
-9. The inner agent invokes the `AgentSkillsProvider`, which calls `AgentMcpSkillsSource.GetSkillsAsync()`. The source now has all resolved variable values and constructs concrete `AgentMcpSkill` instances from the resolved URIs, so it can provide the skill content if requested by the model.
-
-**API sketch:**
-
-```csharp
-// New content types inheriting from MEAI's InputRequestContent/InputResponseContent:
-public sealed class McpResourceTemplateValueRequestContent : InputRequestContent
-{
-    public string TemplateDescription { get; }
-    public string VariableName { get; }
-    public IReadOnlyList<string> PossibleValues { get; }
-    public string TemplateUrl { get; }
-}
-
-public sealed class McpResourceTemplateValueResponseContent : InputResponseContent
-{
-    public string SelectedValue { get; }
-    public string TemplateUrl { get; }
-}
-
-// Decorator usage:
-var provider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(mcpClient)
-    .Build();
-
-AIAgent agent = new ChatClientAgent(chatClient, new ChatClientAgentOptions
-{
-    AIContextProviders = [provider],
-});
-agent = new McpTemplateSkillResolutionAgent(agent);
-```
-
-**Pros:**
-- Works in server-side scenarios
-- Fits the existing `DelegatingAIAgent` decorator pattern
-- Can be composed with other decorators (tool approval, etc.)
-
-**Cons:**
-- Complex implementation
-- Requires user app awareness of the new content types
-- Users need to know that an additional decorator is required for handling MCP template skills, in addition to registering the MCP skills source
-- Resolved template variable values must be persisted across conversation turns so the decorator does not re-prompt on subsequent agent runs within the same session
-
-**Note:** This writeup is high-level and may miss details that could change the design. A POC would be needed to validate the approach.
-
-### Open Questions
-
-1. **Completion API limit** - The MCP completion API returns at most 100 values per request and provides no offset/cursor mechanism for enumeration. If a variable has more than 100 possible values, it's unclear how to retrieve the rest - the API only supports prefix-based filtering (typeahead), not bulk pagination.
-
-2. **Multi-variable templates** - A template like `skill://{org}/{product}/SKILL.md` has multiple variables. Should they be resolved sequentially (org first, then product - since product values may depend on org) or presented together?
-
-3. **Caching** - Should resolved template values be saved in the `AgentSession` so the user isn't re-prompted on every agent run? How should they be persisted between sessions?
-
----
-
-## Part 2: Direct Skill References
-
-This part covers how to let the model read `skill://` URIs referenced directly (e.g., in an MCP server's `instructions`, in a resource, or in another skill's content) without being listed in `skill://index.json`.
-
-### How MCP Skills and Relative Links Work Today
-
-The `AgentMcpSkillsSource` discovers skills by reading the well-known `skill://index.json` resource from the MCP server:
-
-```json
-{
-  "$schema": "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
-  "skills": [
-    {
-      "name": "unit-converter",
-      "type": "skill-md",
-      "description": "Convert between common units.",
-      "url": "skill://unit-converter/SKILL.md"
-    },
-    {
-      "name": "currency-converter",
-      "type": "skill-md",
-      "description": "Convert between world currencies using live rates.",
-      "url": "skill://currency-converter/SKILL.md"
-    }
-  ]
-}
-```
-
-For each `skill-md` entry it creates an `AgentMcpSkill` instance - frontmatter (name/description) comes straight from the entry. The `AgentSkillsProvider` lists the discovered skills in the model's context (name + description):
-
-```xml
-<available_skills>
-  <skill>
-    <name>unit-converter</name>
-    <description>Convert between common units.</description>
-  </skill>
-  <skill>
-    <name>currency-converter</name>
-    <description>Convert between world currencies using live rates.</description>
-  </skill>
-</available_skills>
-```
-
-It also provides functions to the model so it can load a skill and access its resources:
-
-```csharp
-// Loads the full content of a specific skill.
-load_skill(string skillName)
-
-// Reads a resource associated with a skill (references, assets, dynamic data).
-read_skill_resource(string skillName, string resourceName)
-```
-
-The model calls `load_skill("unit-converter")` and receives the skill content:
-
-```markdown
----
-name: unit-converter
-description: Convert between common units.
----
-## Usage
-
-For the full conversion table, see references/units-table.md.
-```
-
-The skill body references `references/units-table.md` by relative path. The model calls `read_skill_resource("unit-converter", "references/units-table.md")` and receives the resource content:
-
-```markdown
-# Unit Conversion Table
-
-| From  | To   | Factor  |
-| miles | km   | 1.60934 |
-| kg    | lbs  | 2.20462 |
-```
-
-### Direct Reference Examples
-
-A `skill://` URI can appear in any of these locations:
-
-**Server instructions** - the MCP server advertises a skill the model should load:
-
-```text
-Follow our coding standards. Load skill://code-standards/SKILL.md for details.
-```
-
-**A skill body** - a skill's `SKILL.md` links to a sibling resource:
-
-```markdown
----
-name: code-standards
-description: Coding standards and conventions.
----
-## Naming
-
-Follow the naming rules in skill://code-standards/references/naming.md.
-```
-
-**A resource** - the linked resource holds the actual content:
-
-```markdown
-# Naming Rules
-
-- Use PascalCase for public members and type names.
-- Use camelCase for locals and parameters.
-- Prefix interfaces with `I` (e.g. `ISkillReader`).
-- Suffix async methods with `Async`.
-
-For examples, see skill://code-standards/references/naming-examples.md.
-```
-
-How can the model access content by direct reference?
-
-### Function for Reading Direct Skill References
-
-### Option 1: Extend existing `load_skill` and `read_skill_resource` functions
-
-```csharp
-// Added optional 'origin' and a direct skill:// URI is passed in 'skillName'.
-load_skill(string skillName, string? origin = null)
-
-// Added optional 'origin', made 'skillName' optional, and a direct skill:// URI is passed in 'resourceName'.
-read_skill_resource(string resourceName, string? skillName = null, string? origin = null)
-```
-
-The optional `origin` identifies the source/MCP server that should handle the direct URI.
-
-| Case | Call |
-|------|------|
-| Load skill | `load_skill("commit-guidelines")` |
-| Relative resource | `read_skill_resource("commit-guidelines", "examples/COMMIT_EXAMPLES.md")` |
-| `skill://` link (skill) | `load_skill(skillName: "skill://commit-guidelines/SKILL.md", origin: "DirectRefServer")` |
-| `skill://` link (resource) | `read_skill_resource(resourceName: "skill://commit-guidelines/examples/COMMIT_EXAMPLES.md", origin: "DirectRefServer")` |
-
-**Pros:**
-
-- No new functions added: existing tool surface stays at two functions.
-
-**Cons:**
-
-- Unreliable on some models (gpt-4o, gpt-4.1-mini): it often omits `origin` when it should not or calls the wrong function.
-- Optional parameters create silent ambiguity - the model can pass `origin` for non-MCP skills or omit it for `skill://` URIs.
-
-### Option 2 (Proposed): Add a dedicated `read_skill_uri` function alongside existing ones
-
-```csharp
-// Existing functions stay unchanged.
-load_skill(string skillName)
-read_skill_resource(string skillName, string resourceName)
-
-// New function added alongside: reads content by direct skill:// URI.
-read_skill_uri(string uri, string origin)
-```
-
-| Case | Call |
-|------|------|
-| Load skill | `load_skill("commit-guidelines")` |
-| Relative resource | `read_skill_resource("commit-guidelines", "examples/COMMIT_EXAMPLES.md")` |
-| `skill://` link (skill) | `read_skill_uri(uri: "skill://commit-guidelines/SKILL.md", origin:"DirectRefServer")` |
-| `skill://` link (resource) | `read_skill_uri(uri: "skill://commit-guidelines/examples/COMMIT_EXAMPLES.md", origin: "DirectRefServer")` |
-
-**Pros:**
-
-- Purely additive - no changes to existing functions needed; `read_skill_uri` can be deferred and added later when direct `skill://` reference support is needed.
-- Granular approval: each function can have its own approval gate (like the existing `ScriptApproval` for `run_skill_script`), making per-operation approval for skill loading, resource reading, and direct URI access straightforward to add.
-- Both `uri` and `origin` are required - no silent misuse through optional parameters.
-- Clean split: `load_skill`/`read_skill_resource` for named skills, `read_skill_uri` for `skill://` links - no parameter ambiguity.
-
-**Cons:**
-
-- Three read functions (`load_skill`, `read_skill_resource`, `read_skill_uri`), not counting `run_skill_script`: larger tool surface than a single-function design.
-
-### Option 3: Collapse `load_skill` and `read_skill_resource` into a single `read_resource` function
-
-```csharp
-// Single entrypoint for all skill content. 'uri' is required; 'origin' is optional.
-read_resource(string uri, string? origin = null)
-```
-
-- `uri` - what to read: a skill name, a relative resource path, or a `skill://` link.
-- `origin` - determines how `uri` is interpreted:
-  - **omitted** → load skill by name (`uri` is the skill name).
-  - **skill name** → read a relative resource (`uri` is the path within that skill).
-  - **server name** → read content by the `skill://` link (`uri` is handled by the source identified by the `[Origin: X]` marker).
-
-Dispatch is ordered: null `origin` routes to Case 1; if `origin` names a known skill, routes to Case 2; otherwise tries to find an `ISkillUriReader` whose `CanRead` returns true for `origin` (Case 3).
-
-| Case | Call |
-|------|------|
-| Load skill | `read_resource(uri: "commit-guidelines")` |
-| Relative resource | `read_resource(uri: "examples/COMMIT_EXAMPLES.md", origin: "commit-guidelines")` |
-| `skill://` link (skill) | `read_resource(uri: "skill://commit-guidelines/SKILL.md", origin: "DirectRefServer")` |
-| `skill://` link (resource) | `read_resource(uri: "skill://commit-guidelines/examples/COMMIT_EXAMPLES.md", origin: "DirectRefServer")` |
-
-**Pros:**
-
-- Minimal tool surface: one read function instead of two or three (not counting `run_skill_script`) reduces token usage and gives the model fewer choices.
-
-**Cons:**
-
-- No per-operation approval: all cases (skill loading, resource reading, direct URI access) share one function, so approval cannot be scoped to individual operations.
-- Unreliable on gpt-4.1-mini: omits `origin` when reading `skill://` links, passes skill name as `origin` when loading a plain skill (should be omitted), and hallucinates resource names (e.g. `API_SPECIFICATION.md`) that do not exist.
-
-
----
-
-### Origin Marker
-
-A `skill://` URI does not carry an origin, but the model needs to provide one when reading it. The `origin` is what routes the read call to the source that can handle the URI - the provider uses it to pick the matching source. Since the URI itself carries no such hint, the MCP source injects an `[Origin: ...]` marker wherever a `skill://` URI appears, so the model can read it back and pass it as the `origin` argument.
-
-The marker is only added when the content actually contains `skill://` references. If a piece of content (server instructions, a skill body, or a resource) has no `skill://` URIs, there is nothing for the model to read back, so no marker is injected.
-
-Into **server instructions**, which may mention `skill://` URIs directly:
-
-```
-[Origin: code-standards-server]
-Follow our coding standards. Load skill://code-standards/SKILL.md for details.
-```
-
-Into **skill bodies**, since a `SKILL.md` may reference other `skill://` URIs (a resource file or a related skill):
-
-```
-[Origin: code-standards-server]
-# Code Standards
-
-For naming conventions, load skill://code-standards/references/naming.md.
-```
-
-Into **skill resources**, since a resource may itself reference further `skill://` URIs:
-
-```
-[Origin: code-standards-server]
-# Naming Rules
-
-- Use PascalCase for public members and type names.
-- Use camelCase for locals and parameters.
-
-For examples, see skill://code-standards/references/naming-examples.md.
-```
-
----
-
-### Read-by-URI Capability: Interface vs Base Class Virtual Methods
-
-Now let's look at how an `AgentSkillsSource` can opt in to reading `skill://` URIs and signal that capability to the provider.
-
-### Option 1: New `ISkillUriReader` interface
-
-```csharp
-public interface ISkillUriReader
-{
-    // Returns true if this reader can handle the given skill:// URI from the given origin.
-    bool CanRead(string uri, string origin);
-
-    // Reads and returns the content for the given skill:// URI.
-    Task<object?> ReadByUriAsync(string uri, string origin, CancellationToken cancellationToken = default);
-}
-```
-
-Sources that support direct `skill://` URI reads - such as `AgentMcpSkillsSource` - implement this interface to opt in.
-
-The provider discovers readers via a service locator and dispatches to the first that can handle the URI:
-
-```csharp
-// Discover all registered readers.
-var readers = source.GetService<IEnumerable<ISkillUriReader>>();
-
-// Pick the first reader that can handle the URI.
-var reader = readers.FirstOrDefault(r => r.CanRead(uri, origin))
-    ?? throw new InvalidOperationException($"No reader can handle URI '{uri}' from origin '{origin}'.");
-
-// Delegate the read to it.
-return await reader.ReadByUriAsync(uri, origin, cancellationToken);
-```
-
-The provider may treat a source implementing `ISkillUriReader` as the signal to advertise `read_skill_uri`: if at least one registered source implements the interface, the function is exposed to the model; otherwise it is not.
-
-### Option 2 (Proposed): Virtual methods on `AgentSkillsSource` base class
-
-```csharp
-public abstract class AgentSkillsSource
-{
-    // New members for reading by URI.
-
-    // Whether this source can read by URI; drives whether read_skill_uri is advertised. Off by default.
-    public virtual bool SupportsReadByUri => false;
-
-    // Returns true if this source can handle the given skill:// URI from the given origin.
-    public virtual bool CanReadByUri(string uri, string origin) => false;
-
-    // Reads and returns the content for the given skill:// URI.
-    public virtual Task<object?> ReadByUriAsync(string uri, string origin, CancellationToken cancellationToken = default)
-        => Task.FromResult<object?>(null);
-
-    // Existing member.
-    public abstract Task<IList<AgentSkills>> GetSkillsAsync(CancellationToken cancellationToken = default);
-}
-```
-
-Sources opt in by overriding, and the provider calls them directly:
-
-```csharp
-// AgentMcpSkillsSource opts in by overriding the virtuals.
-public override bool SupportsReadByUri => true;
-
-// Handles the URI when its origin matches this source's MCP server.
-public override bool CanReadByUri(string uri, string origin)
-    => string.Equals(origin, this.Origin, StringComparison.OrdinalIgnoreCase);
-
-// Reads content by skill:// URI from the MCP server.
-public override Task<string?> ReadByUriAsync(string uri, string origin, CancellationToken cancellationToken)
-    => /* resolve uri via the MCP server identified by origin */;
-```
-
-All sources inherit the methods, so there is no type signal - `SupportsReadByUri` fills that role. The function is advertised when any registered source returns `true`.
-
-### Comparison
-
-| Aspect | Option 1: Interface | Option 2: Base class virtual methods |
-|--------|---------------------|--------------------------------------|
-| Discovery | Service locator | Direct call on source |
-| Advertising signal | Interface implementation | `SupportsReadByUri` flag |
-| Adding new members | Breaking change | Non-breaking |
-| Complexity | Higher | Lower |
-
----
-
-### Include MCP Server Instructions Into Agent Instructions
-
-MCP server instructions may contain the `skill://` references the model needs, so we want to surface them in the agent's instructions. But they can also carry system prompts or behavioral directives irrelevant to the agent, polluting context - so inclusion is **opt-in** via the `IncludeServerInstructions` option:
-
-```csharp
-public sealed class AgentMcpSkillsSourceOptions
-{
-    // When true, the MCP server's instructions are injected into the agent instructions. Off by default.
-    public bool IncludeServerInstructions { get; set; }
-}
-
-builder.UseMcpSkills(mcpClient, options => options.IncludeServerInstructions = true);
-```
-
-When enabled, the instructions travel alongside the discovered skills on `AgentSkillsResult`:
-
-```csharp
-public class AgentSkillsResult
-{
-    // The skills discovered from the source.
-    public IList<AgentSkill> Skills { get; }
-
-    // The MCP server instructions, when IncludeServerInstructions is enabled; otherwise null.
-    public string? Instructions { get; }
-}
-```
-
-The `AgentSkillsProvider` then appends them to its own skill-usage guidance when building the agent's instructions:
-
-```csharp
-var result = await source.GetSkillsAsync(cancellationToken);
-
-var instructions = DefaultSkillsInstructionPrompt;
-if (!string.IsNullOrWhiteSpace(result.Instructions))
-{
-    // Combine the provider's skill-usage guidance with the server instructions.
-    instructions += Environment.NewLine + result.Instructions;
-}
-```
-
-### Enabling Direct Skill References
-
-Following direct `skill://` references is **disabled by default** and activated via an option. When enabled, the provider advertises the read function to the model, and the source injects the `[Origin: ...]` marker into all content provided by the MCP server that contains `skill://` references. When disabled, no function is advertised and no marker is injected.
-
-```csharp
-public sealed class AgentMcpSkillsSourceOptions
-{
-    public bool EnableDirectReferences { get; set; }
-}
-
-builder.UseMcpSkills(mcpClient, options => options.EnableDirectReferences = true);
-```
-
-## Decision Outcome
-
-### Template Variable Resolution: Callback vs Decorator (Part 1)
-
-**Postponed.** Deferring this decision until:
-
-- We have a concrete list of scenarios that require template variable resolution.
-- The skills-over-MCP spec is released (it is still a draft, so the design may change).
-- There is a strong signal of demand from users or the ecosystem.
-
-### Function for Reading Direct Skill References (Part 2)
-
-**Postponed.** Leaning toward **Option 2 - dedicated `read_skill_uri` function alongside existing ones** (purely additive, and each function can have its own approval gate for granular per-operation approval), but deferring the decision until:
-
-- The skills-over-MCP spec is released (it is still a draft, so the design may change).
-- There is a strong signal of demand from users or the ecosystem.
-
-### Read-by-URI Capability: Interface vs Base Class (Part 2)
-
-**Postponed.** Leaning toward **Option 2 - virtual methods on `AgentSkillsSource`** (non-breaking, lower complexity, and a natural fit with the existing base class hierarchy), but deferring the decision until:
-
-- The skills-over-MCP spec is released (it is still a draft, so the design may change).
-- There is a strong signal of demand from users or the ecosystem.
-
-The method naming (`SupportsReadByUri`, `CanReadByUri`, `ReadByUriAsync`) should also be abstracted a little more before adoption, so the same members can be reused when a similar direct-reference concept is needed for other skill types (e.g. file skills).
-
-## References
-
-- [SEP-2640: Skills Extension](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/2640) - Draft proposal
-- [SEP-2640 Implementation Guidelines: Model-Driven Resource Loading](https://github.com/modelcontextprotocol/experimental-ext-skills/blob/main/docs/sep-draft-skills-extension.md#hosts-model-driven-resource-loading)
-- [MCP Completion API](https://modelcontextprotocol.io/specification/2025-11-25/server/utilities/completion) - Used for template variable resolution
-- [MCP Resource Templates](https://modelcontextprotocol.io/specification/2025-11-25/server/resources#resource-templates)
-- [Skills Over MCP Working Group](https://github.com/modelcontextprotocol/experimental-ext-skills)
-- [Open Question #4: Multi-server skill dependencies](https://github.com/modelcontextprotocol/experimental-ext-skills/issues/39)
-- [Anthropic Agent Skills - Overview](https://platform.claude.com/docs/en/agents-and-tools/agent-skills/overview) - Prior art: single skill entrypoint + generic file reads
-- [Anthropic Agent Skills in the SDK](https://code.claude.com/docs/en/agent-sdk/skills) - The `Skill` tool exposed to the model

docs/decisions/0029-python-agent-session-identity.md

@@ -1,356 +0,0 @@
----
-status: accepted
-contact: eavanvalkenburg
-date: 2026-06-19
-deciders: eavanvalkenburg, moonbox3, TaoChenOSU, chetantoshnival
-consulted: westey-m
-informed:
----
-
-# Python identity lifetimes for sessions, tasks, and continuation
-
-## Context and Problem Statement
-
-Python `AgentSession` currently carries a local `session_id`, an optional opaque service continuation
-`service_session_id`, and provider state. `service_session_id` is any service-owned value that lets that service continue
-a conversation, session, or thread; chat clients happen to map it through the abstract `conversation_id` ChatOption, but
-other agent types can use it differently. It is not a generic correlation field, and generic correlation should not
-require parsing or understanding that opaque service-owned value.
-
-The related issues mix values with different lifetimes:
-
-- **Session / conversation identity**: values that group a multi-turn interaction. Examples: A2A `context_id`, OpenAI
-  Responses `conversation` (`conv_*`) or response-chain continuation (`previous_response_id`).
-- **Task identity**: values that identify a protocol task and may affect future protocol calls. Example: A2A `task_id`.
-- **Message / response identity**: values that identify an output message or response. Examples: A2A `message_id` /
-  `artifact_id`, OpenAI Responses response id (`resp_*`).
-- **Continuation token**: a framework resume payload for in-progress work. It may contain the same underlying value as a
-  protocol id, such as A2A `task_id`, but it only exists when there is an unfinished operation to resume.
-
-These values should not automatically live in the same object just because they all help "continue" something. A value
-belongs in `AgentSession` only when it is needed to continue future calls across turns. A value that identifies one
-result belongs on the response or message. A value that resumes in-progress work belongs in a `ContinuationToken`.
-
-An `AgentSession` created for one agent is not expected to be guaranteed to work against another agent. When a session is
-used with an incompatible agent, protocol, or service, the framework should still help users understand what is wrong as
-early as possible, preferably before calling out to the remote service.
-
-For #4673, native conversation identity propagation should be based on `AgentSession` where the value is durable session
-state. For #4893, A2A `context_id` and `task_id` need a coherent Agent Framework mapping.
-
-AG-UI is out of scope for the decision. Its `thread_id` already maps to `AgentSession.session_id` in the normal wrapper
-path, and `run_id` is wrapper-owned event correlation. If AG-UI run correlation needs framework telemetry integration
-later, that should be handled as a run-context/telemetry design, not as session identity.
-
-### Concrete gap example
-
-At the protocol level, the durable continuation payload shapes are different:
-
-```json
-// A2A: future calls may need multiple durable protocol fields
-{
-  "context_id": "ctx_123",
-  "task_id": "task_789",
-  "task_state": "input_required"
-}
-```
-
-```json
-// OpenAI Responses: future calls usually need one continuation value
-{
-  "previous_response_id": "resp_abc123"
-}
-```
-
-The gap is that A2A continuation state is multi-field while OpenAI continuation is
-typically single-field.
-
-## Current implementation notes
-
-- A2A currently has `A2AAgentSession`, but `A2AAgent.create_session(...)` does not automatically return it.
-- A2A currently mirrors `context_id` into `service_session_id`; that is current behavior, not necessarily the target
-  abstraction.
-- A2A `task_id` is not just cosmetic correlation. It is used for `task_id` when a task is `INPUT_REQUIRED`, for
-  `reference_task_ids` when refining a previous task, and inside `A2AContinuationToken` for in-progress tasks.
-- `RawAgent._prepare_run_context(...)` currently forwards `active_session.service_session_id` as chat `conversation_id`,
-  so any non-string or formatted value affects existing chat-client paths.
-- `OpenAIChatClient` maps chat options `conversation_id` to the Responses API as `previous_response_id` for `resp_*`,
-  `conversation` for `conv_*`, and defaults unrecognized strings to `previous_response_id`. When `store` is not `False`,
-  it returns `response.conversation.id` when available, otherwise `response.id`, as the next service continuation value.
-- For Responses API, the response id (`resp_*`) is also the response/message identity surfaced as
-  `ChatResponse.response_id`; when used for continuation on the next request, it becomes the `previous_response_id`
-  value.
-- Python A2A has not been released as stable yet, so its session factory or session shape can still be adjusted before
-  release.
-
-## Decision Drivers
-
-- Preserve `AgentSession.session_id` as the local/client conversation identity.
-- Preserve `AgentSession.service_session_id` as an opaque service-owned continuation handle.
-- Keep `AgentSession` for durable state needed across turns, not per-run bookkeeping.
-- Store values needed by future calls in durable session state; keep values that only resume in-progress work in
-  `ContinuationToken`.
-- Fix the current confusion where session, task, response, and continuation values can be treated as interchangeable
-  because they all participate in "continuing" something.
-- Make the implementation following this ADR preserve the lifetime split clearly: future-call state, in-progress resume
-  tokens, response/message ids, and protocol event correlation must not be silently mixed.
-- Expose durable continuation state in a typed way when future calls depend on it.
-- Let telemetry correlate runs without parsing opaque service continuation handles.
-- Reuse existing run/context surfaces before introducing a new identity abstraction.
-- Keep MCP and other remote tool boundaries safe: framework identity must not be forwarded to remote tools unless an
-  existing explicit opt-in mechanism says so.
-- Keep existing `AgentSession.to_dict()` / `from_dict()` migration and compatibility straightforward.
-- Stay close to .NET where there is already behavior to match, especially A2A's `ContextId`, `TaskId`, and `TaskState`.
-- Detect incompatible session identity shapes as early as practical, preferably before a remote service call.
-
-## Non-goals
-
-- Do not design a provider-agnostic conversation creation API here. That is tracked separately in #6622.
-- Do not make `service_session_id` a generic telemetry or run-correlation field.
-- Do not introduce a new identity object if existing run/context objects can carry the selected per-run correlation value.
-- Do not make a session from one agent guaranteed to work against another agent.
-- Do not optimize the public `agent.run(...)` API for protocol-wrapper internals.
-
-## Remaining question: durable shape for additional continuation state
-
-- Option A: Use protocol-specific `AgentSession` subclasses.
-- Option B: Extend `service_session_id` with richer service-owned values.
-- Option C: Add a dedicated dict for additional session details.
-- Option D: Store additional durable state inside `AgentSession.state`.
-
-### Option A: Use protocol-specific `AgentSession` subclasses
-
-Each protocol or agent type that needs additional durable state keeps a specialized `AgentSession` subclass. For A2A,
-that means keeping `A2AAgentSession` for A2A-specific durable state and changing `A2AAgent.create_session(...)` to return
-that type.
-
-Example:
-
-```python
-# First call returns a task that future A2A messages may need to reference.
-session = await a2a_agent.create_session()
-
-response = await a2a_agent.run(
-    message,
-    session=session,
-)
-
-# A2AAgent updates durable A2A protocol state from the returned task/status payload.
-# The user does not set these manually.
-assert isinstance(session, A2AAgentSession)
-assert session.task_id is not None
-assert session.task_state is not None
-
-# Later call reuses the durable A2A session state. A2AAgent decides whether to send task_id
-# for INPUT_REQUIRED or reference_task_ids for task refinement.
-next_response = await a2a_agent.run(
-    next_message,
-    session=session,
-)
-```
-
-- Good, because protocol-specific state stays in a protocol-specific type.
-- Good, because it aligns with .NET A2A's `A2AAgentSession` shape.
-- Good, because Python A2A can still make this pre-release session factory adjustment.
-- Good, because `task_state` does not get promoted to a base `AgentSession` concept.
-- Bad, because generic consumers cannot read protocol-specific state without knowing about the subclass or a helper API.
-- Bad, because it depends on each subclass consistently setting shared session fields such as `service_session_id` where
-  those are part of the shared abstraction.
-
-### Option B: Extend `service_session_id` with richer service-owned values
-
-Keep the common `service_session_id` case as a plain string. When an agent/service needs more than one service-owned
-continuation value, allow `service_session_id` to be a typed structured value, such as a `TypedDict`. The main session ID
-used for `gen_ai.conversation.id` should still be extracted by the owning agent, not inferred by generic telemetry code.
-
-Examples:
-
-```python
-simple_session = AgentSession(
-    service_session_id="resp_123",
-)
-
-structured_session = AgentSession(
-    service_session_id=A2AServiceSessionId(
-        context_id="ctx_123",
-        task_id="task_789",
-        task_state=TaskState.TASK_STATE_WORKING,
-    ),
-)
-```
-
-- Good, because the common case remains a plain string and stays simple.
-- Good, because richer service-owned continuation state stays under the existing continuation property.
-- Good, because a structured value can make framework-side validation possible before a value is sent back to a service.
-- Good, because A2A can keep `context_id`, `task_id`, and `task_state` together as the service/protocol-owned continuation
-  value without adding A2A fields to base `AgentSession`.
-- Neutral, because telemetry needs an agent-owned extractor to pick the `gen_ai.conversation.id` value from either a
-  string or structured `service_session_id`.
-- Neutral, because Python A2A would need a pre-release adjustment to stop relying on `A2AAgentSession` for these fields.
-- Bad, because changing the `service_session_id` type is a compatibility risk for users, providers, serialization, and
-  tests.
-- Bad, because every path that sends `service_session_id` back to a service must consistently extract/adapt the
-  service-owned continuation component.
-
-### Option C: Add a dedicated dict for additional session details
-
-Keep `service_session_id` as the primary opaque service-owned continuation handle, and add a separate dictionary for
-additional durable protocol/service values that need to travel with the session.
-
-Example:
-
-```python
-session = AgentSession(
-    service_session_id="ctx_123",
-    session_details={
-        "task_id": "task_456",
-        "task_state": TaskState.TASK_STATE_WORKING,
-    },
-)
-```
-
-- Good, because the main service continuation handle stays a plain `service_session_id` string.
-- Good, because extra state has an explicit home and does not overload `service_session_id`.
-- Good, because generic consumers can look in one documented place for additional session-scoped values.
-- Neutral, because helper APIs can hide the raw dictionary access.
-- Bad, because this still introduces string-keyed state unless the dict values are wrapped by typed helpers.
-- Bad, because it adds another public session field that needs serialization, naming, and compatibility rules.
-- Bad, because generic consumers still need to understand the shape or use helpers for the selected agent/session type.
-
-### Option D: Store additional durable state inside `AgentSession.state`
-
-Keep base `AgentSession` unchanged and store additional durable continuation/protocol state under namespaced keys in
-`session.state`.
-
-Example:
-
-```python
-session = AgentSession(session_id="ctx_123")
-
-session.state["a2a"] = {
-    "task_id": "task_456",
-    "task_state": TaskState.TASK_STATE_WORKING,
-}
-```
-
-- Good, because it avoids new public fields and avoids a subclass requirement.
-- Good, because `AgentSession.state` already exists for provider/session state.
-- Neutral, because helper APIs can hide the raw dictionary access.
-- Bad, because stringly typed state is easier to corrupt and harder to validate.
-- Bad, because generic consumers need helper APIs anyway; directly reading nested dictionaries is not a good abstraction.
-- Bad, because users may accidentally overwrite or persist invalid protocol state.
-
-## Decision
-
-Chosen decision criteria for the future: **split identity by lifecycle**.
-
-When a protocol emits an id/token, place it by answering "what lifecycle does this value serve?":
-
-- **Future-call continuation state** -> durable session state. Examples: A2A `context_id` + `task_id` + `task_state`;
-  OpenAI Responses `previous_response_id`/`conversation`.
-- **Single-result identity** -> response/message object only. Examples: OpenAI `resp_*`, A2A `message_id`,
-  A2A `artifact_id`.
-- **Resume unfinished work** -> `ContinuationToken` only. Example: a token carrying in-progress task resume data.
-- **Run-start-only request fields** -> run method arguments/options, not durable session state. Example: A2A
-  `reference_task_ids` for a specific follow-up/refinement request.
-- **Per-run correlation/telemetry** -> protocol wrapper or run context, not `AgentSession`. Example: wrapper-managed
-  `run_id` used only for tracing/events.
-
-Durable-state option decision: **Option B: Extend `service_session_id` with richer service-owned values**.
-This does **not** add a new top-level identity abstraction; it keeps continuation identity under
-`service_session_id` and keeps run correlation in existing run/telemetry context.
-The immediate implementation gap is mainly in A2A mapping clarity, but the lifecycle split applies
-consistently across providers.
-
-To support telemetry, `BaseAgent` should expose a method that accepts an `AgentSession | None` and returns the value to
-use for `gen_ai.conversation.id`. The default implementation should return `session.service_session_id` when it is a
-string. Agents that use a structured `service_session_id`, such as `A2AAgent`, should override that method and return the
-appropriate primary session/context value.
-
-## Appendix: A2A `task_id` and `reference_task_ids` implementation check
-
-The A2A protocol distinguishes a message's `task_id` from `reference_task_ids`:
-
-- `task_id` associates the message with a specific task.
-- `reference_task_ids` provides additional task context, for example when a new task refines or follows up on the result
-  of a previous task.
-
-The protocol does not appear to prescribe that `task_id` and `reference_task_ids` are mutually exclusive. If both are
-present, the natural reading is that the message is associated with one task while also referencing other tasks for
-context. The serving agent decides how to interpret that context.
-
-The Python implementation should check and likely adjust the current behavior:
-
-- `task_id` should be updated by the current run when the remote A2A service returns a task/status payload.
-- `task_id` should remain durable A2A session state when needed for future calls, for example when a task is
-  `INPUT_REQUIRED`.
-- `reference_task_ids` should be a run parameter / caller intent for the current request, not implicit durable session
-  continuation state.
-- A follow-up/refinement request should pass explicit `reference_task_ids` when it wants to reference previous tasks.
-- If both session `task_id` and run `reference_task_ids` are present, the wrapper should preserve the protocol
-  distinction rather than treating one as a replacement for the other.
-- If no `reference_task_ids` are supplied, the wrapper should not automatically infer them from the last session task
-  unless we deliberately keep that convenience for compatibility.
-
-## Appendix: implementation notes for Option B
-
-The exact names are implementation details, but the shape should be:
-
-```python
-class A2AServiceSessionId(TypedDict):
-    context_id: str
-    task_id: str | None
-    task_state: TaskState | None
-
-
-class AgentSession:
-    def __init__(
-        self,
-        *,
-        session_id: str | None = None,
-        service_session_id: str | ServiceSessionId | None = None,
-    ) -> None:
-        ...
-
-
-class BaseAgent:
-    def _get_otel_conversation_id(self, session: AgentSession | None) -> str | None:
-        service_session_id = session.service_session_id if session else None
-        return service_session_id if isinstance(service_session_id, str) else None
-
-
-class A2AAgent(BaseAgent):
-    def _get_otel_conversation_id(self, session: AgentSession | None) -> str | None:
-        service_session_id = session.service_session_id if session else None
-        if isinstance(service_session_id, Mapping):
-            return service_session_id.get("context_id")
-        return service_session_id if isinstance(service_session_id, str) else None
-
-
-class AgentTelemetryLayer:
-    def _trace_agent_invocation(...):
-        attributes = _get_span_attributes(
-            ...,
-            thread_id=self._get_otel_conversation_id(session),
-            ...,
-        )
-```
-
-This keeps the OpenTelemetry extraction decision with the agent that owns the service continuation shape. Generic OTel
-code should not parse structured `service_session_id` values directly.
-
-`AgentSession` must also be updated so `service_session_id` can store either the current string value or a structured
-service-owned value. Serialization must preserve both shapes, and existing serialized sessions with string
-`service_session_id` must continue to round-trip unchanged.
-
-## More Information
-
-Related work and issues:
-
-- #4673: native conversation ID propagation.
-- #4893: align A2A protocol concepts with Agent Framework session/continuation concepts.
-- #2931: Foundry-specific conversation creation helper, split into a separate Python PR.
-- #6622: broader provider-agnostic conversation creation API discussion requiring .NET sync.
-- [ADR-0015](0015-agent-run-context.md): AgentRunContext for Agent Run.
-- [ADR-0018](0018-agentthread-serialization.md): AgentSession serialization.
-- [ADR-0026](0026-hosted-session-identity-context.md): hosted session identity context.

docs/decisions/0030-hosted-platform-context-agentserver-2.0.md

@@ -1,84 +0,0 @@
----
-status: accepted
-contact: rogerbarreto
-date: 2026-06-29
-deciders: rogerbarreto
-consulted: []
-informed: []
----
-
-# Hosted platform context (user id + call id) for Foundry Hosting on AgentServer 2.0
-
-Supersedes [ADR-0026](0026-hosted-session-identity-context.md).
-
-## Context and Problem Statement
-
-[ADR-0026](0026-hosted-session-identity-context.md) sourced the hosted-agent end-user identity from `ResponseContext.Isolation` (an `IsolationContext` typed `UserIsolationKey` / `ChatIsolationKey`), injected by the platform as the `x-agent-user-isolation-key` and `x-agent-chat-isolation-key` headers.
-
-`Azure.AI.AgentServer.*` 2.0.0 (responses protocol `2.0.0`) removes that surface. `ResponseContext.Isolation` is gone; the platform now exposes `ResponseContext.PlatformContext` (a `PlatformContext` typed `UserIdKey` and `CallId`), populated from the `x-agent-user-id` and `x-agent-foundry-call-id` headers. The chat isolation key no longer exists, and a new per-request **call id** is introduced that first-party Foundry services (the toolbox proxy in particular) require on outbound calls to resolve the server-side-stored caller context. The hosting layer in `Microsoft.Agents.AI.Foundry.Hosting` had to migrate to this contract without changing the public shape that samples and providers depend on.
-
-## Decision Drivers
-
-- Track the breaking `Azure.AI.AgentServer.*` 2.0.0 surface (`PlatformContext` replacing `Isolation`) while keeping the same per-user partitioning guarantees from ADR-0026.
-- Keep the change **internal**: existing hosted samples and `AIContextProvider`s must not need code changes. `session.GetHostedContext().UserId`, `HostedSessionIsolationKeyProvider`, and `AddFoundryResponses` stay source-compatible.
-- Forward the new per-request call id verbatim on outbound calls to Foundry first-party services so per-user toolbox OAuth consent and other server-side caller-context lookups keep working.
-- Remain resilient on protocol `1.0.0`: when only the legacy headers are present, `UserIdKey` still resolves and `CallId` is simply absent.
-- Preserve the strict-resume tamper defense from ADR-0026 with identity now reduced to user only.
-
-## Considered Options
-
-For the identity source:
-
-1. **Map `ResponseContext.PlatformContext.UserIdKey`** into the existing `HostedSessionContext` (user only), keeping ADR-0026's storage shape and read accessor.
-2. Keep a `ChatId` slot on `HostedSessionContext` for backward source-compatibility, populated from `CallId` or left null.
-
-For the call id propagation:
-
-A. **A request-scoped ambient (`HostedCallContext`, an `AsyncLocal<string?>`)** set by the handler and re-applied before each egress point, read by the outbound delegating handler.
-B. Thread the call id through every method signature down to the toolbox bearer handler.
-
-For session keying (previously implied by the conversation/chat pairing):
-
-I. **`HostedConversationKey`** resolving a stable partition from `conversation_id ?? partition(previous_response_id) ?? partition(responseId)`.
-II. Continue keying on the container session id (`FOUNDRY_AGENT_SESSION_ID`).
-
-## Decision Outcome
-
-Chosen: **Option 1** for identity, **Option A** for call id, **Option I** for session keying.
-
-Rationale:
-
-- **`ChatId` dropped (Option 2 rejected).** The platform no longer supplies a chat key; carrying a synthetic one would invent identity the trust boundary does not provide. `HostedSessionContext` becomes user-only (`HostedSessionContext(string userId)` / `UserId`), and the strict-resume check validates `UserId` alone. The corresponding `HostedFoundryMemoryProviderScopes` values `PerChat` and `PerUserAndChat` are removed; `PerUser` is retained.
-- **Ambient call id (Option B rejected).** Writing `HostedCallContext.CallId` inside the streaming `async IAsyncEnumerable` iterator is reverted across each `yield`, so a single up-front assignment is lost before the toolbox/MCP egress runs. The handler therefore captures `context.PlatformContext?.CallId` once and **re-applies it immediately before each egress point**; `FoundryToolboxBearerTokenHandler` forwards it as `x-agent-foundry-call-id`. The ambient is request-scoped and never leaks into the caller's execution context (guarded by a unit test).
-- **`HostedConversationKey` (Option II rejected).** One container serves many conversations for its lifetime, so the container session id cannot key per-conversation state. The partition key is derived from the conversation/`previous_response_id`/minted response id instead.
-
-Implementation summary in `Microsoft.Agents.AI.Foundry.Hosting`:
-
-| Type | Visibility | Change vs ADR-0026 |
-|---|---|---|
-| `HostedSessionContext` | public sealed | Now user-only (`UserId`); `ChatId` removed. |
-| `PlatformHostedSessionIsolationKeyProvider` | internal sealed | Maps `context.PlatformContext.UserIdKey` (was `context.Isolation.UserIsolationKey` / `ChatIsolationKey`). |
-| `HostedCallContext` | internal static | New. Request-scoped `AsyncLocal<string?>` holding the `x-agent-foundry-call-id` value. |
-| `HostedConversationKey` | internal | New. Resolves the per-conversation partition key. |
-| `FoundryToolboxBearerTokenHandler` | internal | Now also forwards `x-agent-foundry-call-id` outbound. |
-| `HostedFoundryMemoryProviderScopes` | public | `PerChat` / `PerUserAndChat` removed; `PerUser` kept. |
-
-Package manifests bump the responses container protocol to `2.0.0` (invocations stays `1.0.0`).
-
-## Consequences
-
-Positive:
-
-- Per-user memory partitioning and the strict-resume tamper defense from ADR-0026 are preserved with no public API churn for samples or providers.
-- Per-user toolbox OAuth consent and other server-side caller-context lookups keep working because the per-request call id is forwarded on egress.
-- Works unchanged on protocol `1.0.0` (no call id) and `2.0.0`.
-
-Negative:
-
-- `HostedSessionContext.ChatId` and the `PerChat` / `PerUserAndChat` memory scopes are removed; any out-of-tree consumer that referenced them must move to user-scoped partitioning.
-- The call id must be re-applied before every egress point because of the async-iterator `AsyncLocal` revert; a missed re-apply silently drops the header. This is covered by unit tests.
-
-## Out of scope
-
-- HMAC tamper signatures over the persisted context remain unimplemented; equality comparison against `ResponseContext.PlatformContext` on every request is sufficient because the platform sets the header at the trust boundary.
-- The per-request `User` field on `CreateResponse` is still intentionally not consumed.

docs/decisions/0031-hosted-per-user-session-storage-isolation.md

@@ -1,119 +0,0 @@
----
-status: accepted
-contact: rogerbarreto
-date: 2026-06-30
-deciders: rogerbarreto
-consulted: []
-informed: []
----
-
-# Per-agent and per-user session-storage isolation for Foundry Hosting
-
-Builds on [ADR-0030](0030-hosted-platform-context-agentserver-2.0.md).
-
-## Context and Problem Statement
-
-A Foundry hosted container can serve many end users (and, in .NET, many agents) over its lifetime. The
-`AgentSessionStore` persists each turn's `AgentSession` (which for a workflow agent carries the workflow
-checkpoint, and which also carries the tool-approval mapping via `ToolApprovalIdMap` in the session state
-bag). [ADR-0030](0030-hosted-platform-context-agentserver-2.0.md) protected cross-user access only through
-the strict-resume identity check (a 403 when the persisted `HostedSessionContext.UserId` does not match the
-live request). The persisted artifacts themselves were keyed by `conversationId` (+ agent name), not
-physically partitioned per user, so a forged `conversation_id` would still resolve to another user's file
-path before the identity check rejected it.
-
-The Python hosting package added physical per-user partitioning (`<root>/<user_id>/<context_id>`) plus a
-reject-style path-traversal guard. We want .NET to provide the same defense-in-depth, adapted to the .NET
-hosting model.
-
-## Decision Drivers
-
-- Defense in depth: a forged/guessed id must not even resolve to another tenant's storage path, independent
-  of the identity check.
-- Multi-agent hosting: a single .NET container hosts multiple agents resolved from keyed DI, so the layout
-  must isolate per agent as well as per user (Python hosts a single agent and needs no agent layer).
-- Path-traversal safety (CWE-22) for the untrusted, platform-injected user id.
-- Back-compat for local development (no `x-agent-user-id` header) and for direct/non-hosted store use.
-- Keep the change contained and avoid the async-iterator `AsyncLocal` revert hazard from ADR-0030.
-
-## Considered Options
-
-- **Path partition inside `FileSystemAgentSessionStore`**, threading the user id explicitly through the
-  `AgentSessionStore` API, with self-describing prefixed segments.
-- A delegating store that prefixes the conversation id with the user id (the
-  `IsolationKeyScopedAgentSessionStore` pattern from `Microsoft.Agents.AI.Hosting`). Rejected: still needs the
-  user id on the read path and yields a flat key rather than nested per-tenant directories.
-- An `AsyncLocal<string?>` user-context set by the handler. Rejected: the session is saved in the handler's
-  `finally` after the streaming `yield`s, where an `AsyncLocal` set up front is reverted (the same hazard
-  that forced explicit call-id re-application in ADR-0030). Explicit threading is safer and clearer.
-- A separate per-user approval store (as in Python). Rejected as unnecessary: see below.
-
-## Decision Outcome
-
-Path layout with self-describing, prefixed segments; user id threaded explicitly:
-
-    {root}/ a-{agentName} / u-{userId} / c-{contextId}.json
-
-- `a-` (agent), `u-` (user), `c-` (context) are constant literals applied to the sanitized/validated value,
-  so a collapsed layout is never ambiguous and a user id can never masquerade as an agent name.
-- `contextId` is `HostedConversationKey.Resolve` (conversation_id, else the partition of
-  previous_response_id, else of the minted response id).
-- The agent and context layers are always present (Foundry always deploys a named agent). The only
-  collapse is the `u-` layer: present when a user id is resolved (Foundry header, or local dev fallback),
-  absent for raw local runs with no header (`{root}/a-{agent}/c-{conv}.json`). There is no user-only or
-  no-agent layout.
-
-Other elements:
-
-- `string? userId` was added as a **required** parameter (no default) on `AgentSessionStore.GetSessionAsync` /
-  `SaveSessionAsync` (a contained, breaking change to the experimental Foundry abstraction; both in-tree
-  implementations and the two handler call sites were updated). It is required rather than optional so a
-  caller can never silently persist a session unscoped; a genuine no-user caller (local without the header,
-  or a non-hosted direct caller) passes `null` explicitly. `AgentFrameworkResponseHandler` resolves the user
-  id before loading the session.
-- Path-traversal guard: the user id is rejected (not sanitized) when it is not a single safe path segment
-  (path separators, NUL, drive letters, rooted paths, all-dot segments). After building the path, the
-  fully-resolved path is asserted to remain under the storage root.
-- The strict-resume 403 identity check from ADR-0030 is **kept** as the second defense layer (it still
-  catches a session that reaches the wrong partition, e.g. via a non-partitioning custom store or in-process
-  tampering).
-- **No separate approval store.** The tool-approval mapping lives in `ToolApprovalIdMap` ->
-  `AgentSessionStateBag`, which is serialized into the session checkpoint, so partitioning the session path
-  isolates pending approvals per tenant automatically. (Python needs a separate per-user approval store only
-  because it models approvals as a standalone store.)
-
-## Consequences
-
-Positive:
-
-- Cross-tenant isolation is now defense-in-depth: physical per-agent/per-user partitioning plus the identity
-  check. Approvals and workflow checkpoints inherit the partitioning because they ride in the session.
-- Self-describing prefixes make the on-disk layout auditable and collision-free across collapse cases.
-
-Negative:
-
-- Breaking change to the experimental Foundry `AgentSessionStore` API (added `userId`).
-- The on-disk layout and leaf filename change (`<conv>.json` -> `c-<conv>.json`), orphaning sessions written
-  by the ADR-0030 release. Acceptable for an experimental package; a fresh session is created on next use.
-
-## Out of scope
-
-- Encryption at rest and quota enforcement remain platform concerns.
-- Non-Foundry hosting layers can adopt an equivalent scheme independently.
-
-## Update (2026-07-01): local runs no longer fail closed; sample dev provider removed
-
-Superseding the ADR-0026/0030 behavior where a `null` result from `HostedSessionIsolationKeyProvider`
-always became a 500, `AgentFrameworkResponseHandler` now branches on `FoundryEnvironment.IsHosted`:
-
-- **Hosted** (`IsHosted == true`, production): a `null` identity is still a hard error (500). Isolation
-  stays strict; the platform always injects `x-agent-user-id`.
-- **Not hosted** (local `docker run` / `dotnet run`): a `null` identity is tolerated. Per-user isolation
-  is simply not triggered — the handler passes `userId == null` to the store (the documented "no user
-  partition", `{root}/a-{agent}/c-{conv}.json`), stamps no `HostedSessionContext`, and runs no
-  strict-resume check. Contributors can run a hosted image locally with zero extra setup.
-
-Consequently the sample-side `DevTemporaryLocalUserIdProvider` and `AddDevTemporaryLocalContributorSetup`
-were removed. To simulate distinct users locally, send an `x-agent-user-id` request header; the default
-`PlatformHostedSessionIsolationKeyProvider` reads it via `ResponseContext.PlatformContext.UserIdKey`
-(the SDK's `PlatformContext.FromRequest` populates it from the header unconditionally, hosted or not).

docs/features/FIDES_IMPLEMENTATION_SUMMARY.md

@@ -8,8 +8,6 @@
 - **Context Provider Pattern** - `SecureAgentConfig` extends `ContextProvider`, injecting tools, instructions, and middleware automatically
 - **Automatic Variable Hiding** - UNTRUSTED content is automatically hidden without requiring manual intervention
 - **Per-Item Embedded Labels** - Tools return `list[Content]` with `Content.from_text()` for proper label propagation
-- **SecureMCPToolProxy Auto-Labeling** - MCP tools are labeled automatically from MCP `ToolAnnotations` hints
-- **MCP `_meta.ifc` Support** - Per-result IFC labels from servers (for example GitHub MCP with `X-MCP-Features: ifc_labels`) are parsed and enforced
 - **SecureAgentConfig** - One-line secure agent configuration via `context_providers=[config]`
 - **Data Exfiltration Prevention** - `max_allowed_confidentiality` prevents sensitive data leakage
 - **Message-Level Label Tracking** (Phase 1) - Track labels on every message in the conversation
@@ -25,7 +23,6 @@ The FIDES defense system consists of seven main components:
 5. **Security Tools** - Specialized tools for safe handling of untrusted content (`quarantined_llm`, `inspect_variable`)
 6. **SecureAgentConfig** - Context provider for easy secure agent configuration
 7. **Message-Level Label Tracking** - Track labels on every message in the conversation (Phase 1)
-8. **MCP Tool/Result Label Integration** - MCP hint-based tool labeling and `_meta.ifc` result label parsing
 
 ## Implementation Details
 
@@ -187,17 +184,6 @@ agent = Agent(
 )
 ```
 
-### 7. MCP Labeling Pipeline (Hints + `_meta.ifc`)
-
-FIDES now secures remote MCP integration end-to-end:
-
-- **Tool labels from hints**: `apply_mcp_security_labels(...)` maps MCP hints (`readOnlyHint`, `openWorldHint`) to FIDES tool properties.
-- **Safe sink defaults**: tools not explicitly marked `readOnlyHint=True` are treated as potential sinks and receive `max_allowed_confidentiality=public`.
-- **Result labels from metadata**: MCP result `_meta` is propagated via `__mcp_result_meta__`; `_meta.ifc` is parsed into `security_label` per result item.
-- **`SecureMCPToolProxy` convenience**: wraps MCP tools/URLs and applies this labeling automatically on connect.
-
-This behavior is used with the GitHub MCP server when `X-MCP-Features: ifc_labels` is passed, which causes the server to return IFC labels in `_meta` (for example `{"ifc": {"integrity": "untrusted", "confidentiality": "public"}}`).
-
 ## Security Properties
 
 ### Deterministic Defense

docs/specs/002-python-hosting-channels.md

@@ -1,398 +0,0 @@
----
-status: proposed
-contact: eavanvalkenburg
-date: 2026-07-08
-deciders: eavanvalkenburg
----
-
-# Python protocol helpers and optional execution state
-
-## Scope
-
-This specification is the Python implementation plan for
-[ADR-0027](../decisions/0027-hosting-channels.md). It documents the helper-first v1 contract for Python hosting.
-
-The v1 contract is:
-
-- protocol packages expose helper functions that convert protocol-native input to Agent Framework run values;
-- protocol packages expose helper functions that convert Agent Framework run results or streams back to protocol-native
-  payloads or operations;
-- application/framework code owns routes, native SDK clients, authentication, command policy, webhooks, response status
-  codes, and outbound sends;
-- `agent-framework-hosting` provides small optional state holders for Agent Framework targets;
-- state helpers do not own web apps, route contribution, protocol dispatch, command projection, or native SDK calls.
-
-## Goals
-
-- Let apps expose agents and workflows from FastAPI, Starlette, Django, Azure Functions, native SDK webhooks, CLIs, and
-  tests without adopting a host/channel framework.
-- Keep protocol parsing and response formatting inside protocol packages.
-- Keep session continuity explicit and app-owned at the trust boundary.
-- Reuse Agent Framework primitives: `AgentSession`, `CheckpointStorage`, `Agent.run(...)`, `Workflow.run(...)`, and
-  `ResponseStream`.
-- Preserve full-fidelity Agent Framework results until a protocol helper renders them.
-
-## Non-goals for v1
-
-### App-owned in v1
-
-The app builder owns these concerns with normal web-framework, SDK, platform, or application code:
-
-- authentication, authorization policy, and allowlists;
-- deciding whether identities across protocols map to the same `session_id`;
-- non-originating sends using native SDK clients;
-- background work, durable execution, retry, and replay when app code owns the work;
-- routing between multiple agents.
-
-The helper-first model makes app-owned linking and non-originating delivery easier than the old host/channel model because
-app code already owns the native SDK clients, authenticated caller context, session id selection, and outbound sends.
-
-### Future framework work
-
-The following require a separate reviewed design before becoming reusable framework features:
-
-- reusable cross-channel identity linking;
-- framework-owned proactive or non-originating delivery;
-- fan-out, multicast, selected-channel, active-channel, or all-linked delivery;
-- framework-owned delivery observability, dead-letter handling, and replay semantics;
-- cross-channel confidentiality and link policy.
-
-[ADR-0028](../decisions/0028-hosting-linking-multicast-enhancements.md) tracks possible follow-up work in this area and
-must be aligned with the helper-first model before implementation. Old vocabulary such as `IdentityLinker`,
-`ResponseTarget`, `ChannelPush`, `ChannelPushCodec`, `DurableTaskRunner`, `RetryPolicy`, and `LinkPolicy` is not v1 API.
-
-## Packages
-
-| Package | Import surface | v1 helper-first contents |
-|---|---|---|
-| `agent-framework-hosting` | `agent_framework_hosting` | `AgentState`, `WorkflowState`, `SessionStore`, and run-argument `TypedDict`s. |
-| `agent-framework-hosting-responses` | `agent_framework_hosting_responses` | Responses helpers: request parsing, session id extraction, response id creation, response rendering, streaming rendering. |
-| `agent-framework-hosting-telegram` | `agent_framework_hosting_telegram` | Telegram Bot API helpers: update parsing, chat/session/command/media extraction, final rendering, and streaming edit rendering. |
-| Future protocol packages | e.g. `agent_framework_hosting_activity_protocol` | Protocol-specific helpers such as `activity_to_run(...)`, `activity_from_run(...)`, `activity_session_id(...)`, and command/media helpers when useful. |
-
-The core hosting package must not depend on protocol SDKs. Protocol packages may depend on their native protocol SDKs if
-needed, but helper functions should stay usable from plain app code and tests.
-
-## Helper naming and families
-
-Helper names are protocol-specific. Avoid a generic `protocol_to_run(...)` public surface.
-
-Protocol packages may provide the following helper families when the protocol has the concept:
-
-| Helper family | Shape | Purpose |
-| --- | --- | --- |
-| Run conversion | `<protocol>_to_run(...)` | Convert one protocol-native call/update/request into `Agent.run` or `Workflow.run` values. |
-| Final rendering | `<protocol>_from_run(...)` | Convert a final `AgentResponse` or workflow result into protocol-native response payloads or operations. |
-| Stream rendering | `<protocol>_from_streaming_run(...)` | Convert `ResponseStream` or workflow updates into protocol-native events or operations. |
-| Session id extraction | `<protocol>_session_id(...)` | Extract the protocol's natural continuation/partition key from the call, if present. |
-| Command/action parsing | `<protocol>_command(...)` | Parse a protocol-native command/action/operation name without deciding app policy. |
-
-Examples:
-
-- `responses_to_run(...)`, `responses_from_run(...)`, `responses_from_streaming_run(...)`,
-  `responses_session_id(...)`;
-- `telegram_to_run(...)`, `telegram_from_run(...)`, `telegram_from_streaming_run(...)`,
-  `telegram_session_id(...)`, `telegram_command(...)`;
-- `activity_to_run(...)`, `activity_from_run(...)`, `activity_session_id(...)`, `activity_command(...)`;
-- `discord_to_run(...)`, `discord_from_run(...)`, `discord_session_id(...)`, `discord_command(...)`.
-
-This table is a naming guide, not a required checklist. A protocol package should add only the helpers that match native
-protocol concepts and current samples.
-
-Protocol-specific helpers may also exist for native details such as `telegram_chat_id(...)`,
-`telegram_callback_query_id(...)`, `telegram_media_file_id(...)`, `discord_interaction_id(...)`, `a2a_task_id(...)`,
-`a2a_context_id(...)`, or MCP tool/prompt/resource helpers. These helpers should stay side-effect-free. App/native SDK
-code performs acknowledgements, sends/edits messages, resolves protected file URLs, applies rate limits, and registers
-handlers.
-
-## `agent-framework-hosting` state helpers
-
-### `SessionStore`
-
-`SessionStore` is an in-memory async lookup:
-
-```python
-class SessionStore:
-    async def get(self, session_id: str) -> AgentSession | None: ...
-    async def set(self, session_id: str, session: AgentSession) -> None: ...
-    async def delete(self, session_id: str) -> None: ...
-```
-
-The store does not create sessions. It stores `session_id -> AgentSession` values supplied by callers.
-
-The built-in store has no TTL or eviction. This is intentional for local/dev and simple process-local scenarios: protocols
-such as OpenAI Responses can continue from any prior response id. Durable or multi-replica deployments should provide a
-durable store and their own TTL/eviction policy.
-
-### `AgentState`
-
-`AgentState` holds an agent target and an optional `SessionStore`:
-
-```python
-state = AgentState(agent)
-state = AgentState(create_agent)
-state = AgentState(create_agent, cache_target=False)
-```
-
-The target may be:
-
-- a `SupportsAgentRun` instance;
-- a synchronous factory;
-- an asynchronous factory;
-- an awaitable target.
-
-`AgentState` provides:
-
-- `await get_target()`;
-- synchronous `target` only after a target is already available/resolved;
-- `session_store`;
-- `await get_or_create_session(session_id)`;
-- `await set_session(session_id, session)`.
-
-`get_or_create_session(...)` resolves the target and calls `target.create_session(session_id=...)` only when the store has
-no session for that id.
-
-Apps must store the post-run session explicitly after `agent.run(...)` or stream finalization:
-
-```python
-session = await state.get_or_create_session(session_id)
-target = await state.get_target()
-result = await target.run(messages, session=session, options=options)
-await state.set_session(response_id, session)
-```
-
-### `WorkflowState`
-
-`WorkflowState` resolves a workflow target. It does not own checkpoint storage.
-
-The target may be:
-
-- a `Workflow` instance;
-- a `WorkflowBuilder` or other object with `build() -> Workflow`;
-- a synchronous factory;
-- an asynchronous factory;
-- an awaitable target.
-
-`WorkflowState` provides:
-
-- `await get_target()`;
-- synchronous `target` only after a target is already available/resolved.
-
-Workflow checkpointing uses Agent Framework's existing `CheckpointStorage` abstraction directly. Apps that need
-per-session workflow resume should keep an app-owned cursor such as `session_id -> checkpoint_id`. When the app uses
-file-backed cursor storage, the file-based checkpoint storage should share the same app storage root and should be
-scoped to the current authenticated user/tenant/session bucket, for example
-`storage/checkpoints/<session-bucket>/` beside `storage/checkpoint_cursors.json`:
-
-```python
-# session_id must already be authenticated and authorized for this caller
-target = await workflow_state.get_target()
-checkpoint_id = await checkpoint_cursor_store.get(session_id)
-if checkpoint_id is None:
-    result = await target.run(message=workflow_input, checkpoint_storage=checkpoint_storage)
-else:
-    result = await target.run(checkpoint_id=checkpoint_id, checkpoint_storage=checkpoint_storage)
-latest = await checkpoint_storage.get_latest(workflow_name=target.name)
-if latest is not None:
-    await checkpoint_cursor_store.set(session_id, latest.checkpoint_id)
-```
-
-`Workflow.run(...)` does not currently emit a checkpoint id on `WorkflowRunResult` or normal workflow events by default.
-The runner receives checkpoint ids internally from `CheckpointStorage.save(...)`. Apps that own the storage can query
-`get_latest(workflow_name=...)` after the run if they need to update a cursor.
-
-## `agent-framework-hosting-responses`
-
-The Responses package provides the helper-first surface for OpenAI Responses-shaped requests.
-
-### Request helpers
-
-- `messages_from_responses_input(input) -> list[Message]`
-- `responses_to_run(body) -> AgentRunArgs`
-- `responses_session_id(body) -> str | None`
-- `create_response_id() -> str`
-
-`responses_to_run(...)` returns values corresponding to `Agent.run(...)`:
-
-```python
-run = responses_to_run(body)
-messages = run["messages"]
-options = run["options"]
-stream = run["stream"]
-```
-
-It excludes protocol transport/session fields from `options` and remaps known Responses option names such as
-`max_output_tokens -> max_tokens`.
-
-`responses_session_id(...)` returns:
-
-- `previous_response_id` when present (`resp_*`);
-- otherwise `conversation_id` when present (`conv_*`);
-- otherwise `None`.
-
-The helper only extracts the candidate key. App code decides whether to trust and use that key.
-
-### Response helpers
-
-- `responses_from_run(result, *, response_id, session_id=None) -> dict[str, Any]`
-- `responses_from_streaming_run(stream, *, response_id, session_id=None) -> AsyncIterator[str]`
-
-`responses_from_run(...)` renders a full Responses JSON payload from an `AgentResponse`. It renders the full set of
-OpenAI Responses output item types supported by Agent Framework content.
-
-`responses_from_streaming_run(...)` renders Server-Sent Event strings for a `ResponseStream`. It emits a created event,
-text deltas, and a completed event. The final completed payload is produced through `responses_from_run(...)`; the helper
-also preserves the model id observed on streaming updates when the finalized `AgentResponse` no longer carries raw model
-metadata.
-
-## `agent-framework-hosting-telegram`
-
-The Telegram package provides side-effect-free helpers around Telegram Bot API
-update and method payloads. It does not provide a Bot API client, polling loop,
-webhook route, command registry, retry policy, or rate limiter.
-
-### Update helpers
-
-- `telegram_to_run(update, *, resolve_file_url=None, stream=False) -> AgentRunArgs`
-- `telegram_chat_id(update) -> int | None`
-- `telegram_session_id(update, *, bot_id) -> str | None`
-- `telegram_command(update) -> str | None`
-- `telegram_callback_query_id(update) -> str | None`
-- `telegram_media_file_id(update_or_message) -> tuple[str, str] | None`
-
-`telegram_to_run(...)` handles `message`, `edited_message`, and
-`callback_query` updates. Text and captions become AF text content. When the
-app supplies an async `resolve_file_url` callback, supported Telegram media
-file ids can become AF URI content. The package does not call Telegram's
-`getFile` method itself.
-
-`telegram_session_id(..., bot_id=...)` includes the bot identity in every key.
-Private chats return `telegram:<bot_id>:<user_id>`; other chats return
-`telegram:<bot_id>:<chat_id>`, giving groups a shared session by default. This
-matches Telegram's native isolation boundaries while preventing two bots from
-sharing state accidentally. Apps that want per-user sessions inside a group
-can construct a key that includes both chat and sender ids. The app must
-authorize those Telegram identities before loading session state.
-
-`telegram_command(...)` parses Telegram's `/name` and `/name@bot` syntax. It
-does not register commands or invoke handlers.
-
-### Response helpers
-
-- `telegram_from_run(result, *, chat_id, parse_mode=None)`
-- `telegram_from_streaming_run(stream, *, chat_id, message_id, initial_text=None, parse_mode=None)`
-
-The helpers produce Telegram method/payload values for app-owned Bot API
-calls. Final rendering supports text and image URI output and applies
-Telegram's text-length boundary. Streaming rendering produces cumulative
-`editMessageText` payloads for a placeholder message id supplied by the app,
-omitting edits that match an optional `initial_text`, then renders the final
-rich output. Image-only responses remove the placeholder with `deleteMessage`
-before sending the image. The app owns the initial placeholder send, Bot API
-calls, edit throttling, retries, and failure policy.
-
-## Security responsibilities
-
-Protocol helper packages parse and render. They do not authenticate callers, authorize access to state, or decide which
-side effects are allowed.
-
-Application code that uses these helpers is responsible for:
-
-- authenticating the caller through the app's normal mechanism before using protocol-provided ids;
-- authorizing any caller-supplied session, checkpoint, task, context, conversation, thread, or response id before loading
-  state for it;
-- binding externally supplied ids to the authenticated user, tenant, workspace, installation, or chat context before
-  using them as `SessionStore` keys or checkpoint cursor keys;
-- treating `<protocol>_session_id(...)` results as untrusted candidate keys until that ownership check has passed;
-- keeping platform-provided isolation helpers fail-closed outside their trusted hosting environment;
-- authorizing command/action effects such as reset, cancel, approve, submit, or tool invocation after parsing them;
-- opting in explicitly before resolving protected media/resource/file URLs and passing them to a remote model provider;
-- persisting post-run session or checkpoint state only after `agent.run(...)`, `workflow.run(...)`, or stream finalization
-  has updated that state.
-
-## Persistent versus transient hosting
-
-The application builder decides whether the server is persistent or transient.
-
-- Persistent single-process apps, such as a long-running container or web app, may use in-memory state for local
-  development or simple deployments. Multi-replica persistent apps still need durable state for continuity.
-- Transient apps, such as Azure Functions, Foundry Hosted Agents, or any environment where process memory is not a
-  reliable boundary, must not rely on in-memory `SessionStore` state between calls. They need a durable session store or
-  a service-owned continuation id.
-- Workflow hosts must choose an explicit `CheckpointStorage` and, when they need per-session resume, a durable
-  `session_id -> checkpoint_id` cursor. File-backed checkpoint storage and file-backed cursor storage should live under
-  the same app storage root, with checkpoints scoped to the current authenticated user/tenant/session bucket so a
-  "latest checkpoint" lookup cannot cross conversations. In-process workflow state and in-memory checkpoint cursors do
-  not survive transient execution.
-
-## Minimal FastAPI Responses shape
-
-This is the shape the local Responses sample should demonstrate. It is not an app framework.
-
-```python
-from collections.abc import AsyncIterator
-
-from agent_framework import ResponseStream
-from agent_framework_hosting import AgentState
-from agent_framework_hosting_responses import (
-    create_response_id,
-    responses_from_run,
-    responses_from_streaming_run,
-    responses_session_id,
-    responses_to_run,
-)
-from fastapi import Body, FastAPI, HTTPException
-from fastapi.responses import JSONResponse, StreamingResponse
-
-app = FastAPI()
-state = AgentState(create_agent)
-
-
-@app.post("/responses", response_model=None)
-async def responses(body: dict = Body(...)) -> JSONResponse | StreamingResponse:
-    run = responses_to_run(body)
-    candidate_session_id = responses_session_id(body)
-    response_id = create_response_id()
-
-    # Verify this caller owns candidate_session_id before loading it.
-    session_id = candidate_session_id or response_id
-    session = await state.get_or_create_session(session_id)
-    target = await state.get_target()
-
-    if run["stream"]:
-        stream = target.run(run["messages"], stream=True, session=session, options=run["options"])
-        if not isinstance(stream, ResponseStream):
-            raise HTTPException(status_code=500, detail="agent did not return a response stream")
-
-        async def events() -> AsyncIterator[str]:
-            async for event in responses_from_streaming_run(
-                stream,
-                response_id=response_id,
-                session_id=candidate_session_id,
-            ):
-                yield event
-            await state.set_session(response_id, session)
-
-        return StreamingResponse(events(), media_type="text/event-stream")
-
-    result = await target.run(run["messages"], session=session, options=run["options"])
-    await state.set_session(response_id, session)
-    return JSONResponse(responses_from_run(result, response_id=response_id, session_id=candidate_session_id))
-```
-
-## Validation
-
-Implementation validation must cover:
-
-- `SessionStore` plain get/set/delete behavior;
-- `AgentState` target resolution, target caching, and get-or-create session behavior;
-- `WorkflowState` target resolution for direct workflows, factories, `WorkflowBuilder`, and orchestration-style builders;
-- Responses request parsing and option remapping;
-- Responses session id extraction;
-- Responses response rendering, including rich output item mapping;
-- Responses streaming SSE rendering;
-- HTTP round-trip tests showing a native FastAPI route using `AgentState` and Responses helpers;
-- sample type checking for the local Responses sample.
-- Telegram update parsing, chat/session/command/media extraction, final
-  rendering, and streaming edit rendering;
-- sample type checking for the local Telegram polling and webhook entry points.

dotnet/.github/skills/pull-requests/SKILL.md

@@ -1,116 +0,0 @@
----
-name: pull-requests
-description: >
-  Guidance for creating pull requests and handling PR review comments in the
-  Agent Framework repository. Use this when writing a PR description (filling out
-  the PR template) or when responding to and resolving review comments on an
-  existing PR.
----
-
-# Pull Request Workflow
-
-This skill covers two tasks: (1) writing a high-quality PR description, and
-(2) handling review comments on an existing PR.
-
-## 1. Writing the PR description
-
-Always follow the repository PR template at
-[`.github/pull_request_template.md`](../../../../.github/pull_request_template.md). Keep its
-exact structure and headings. Fill every section:
-
-### `### Motivation & Context`
-Explain *why* the change is needed: the problem it solves and the scenario it
-contributes to. Describe the net change relative to `main` — this is implied, so
-do **not** spell out "vs main" explicitly.
-
-### `### Description & Review Guide`
-Describe the changes, the overall approach, and the design. Answer the three
-prompts:
-- **What are the major changes?**
-- **What is the impact of these changes?**
-- **What do you want reviewers to focus on?** — This item is for **human
-  reviewers only**. Automated/AI reviewers must ignore it and review the entire
-  change rather than narrowing scope to it.
-
-### `### Related Issue`
-Link the issue the PR fixes using a GitHub closing keyword (`Fixes #123` /
-`Closes #123`) so it closes automatically on merge. A PR with no linked issue may
-be closed regardless of how valid the change is. Before opening, confirm there is
-no other open PR for the same issue; if there is, explain how this PR differs.
-
-### `### Contribution Checklist`
-Check every item that applies. For the breaking-change item:
-- Leave **"This is not a breaking change."** checked for the common case.
-- If the change **is** breaking, add the `breaking change` label **or** put
-  `[BREAKING]` in the title prefix, before or after a language prefix such as
-  `Python:` or `.NET:` — workflows keep the label and the title prefix in sync
-  automatically (see `.github/workflows/label-title-prefix.yml` and
-  `.github/workflows/label-pr.yml`).
-
-### Do not
-- Do **not** add ad-hoc sections such as "Validation" or "Tests run"; CI/CD and
-  the checklist already cover validation status.
-- Do **not** remove or reorder the template's headings.
-
-### Creating the PR
-Open new PRs as **drafts** until they are ready for review. Example:
-
-```bash
-gh pr create --repo microsoft/agent-framework --base main \
-  --head <your-fork-owner>:<branch> --draft \
-  --title "<concise title>" --body "<body following the template>"
-```
-
-## 2. Handling review comments
-
-When a PR receives review comments, follow this sequence — **do not start editing
-code before the user has reviewed the plan**:
-
-1. **Review the comments.** Read every review comment and thread on the PR,
-   including inline code comments and general review summaries.
-2. **Make a plan.** Produce a concrete plan describing how each comment will be
-   addressed (or why it should not be, with reasoning).
-3. **Let the user review the plan.** Present the plan and wait for the user's
-   approval or adjustments before implementing anything.
-4. **Implement.** Make the agreed changes.
-5. **Reply to every comment.** Add a reply to **all** comments explaining how it
-   was addressed (or the agreed outcome) — leave none unanswered.
-6. **Resolve resolved threads.** Mark a review thread as resolved only when the
-   comment has actually been addressed.
-
-### Useful commands
-
-List review comments and threads:
-
-```bash
-# Inline review comments
-gh api repos/{owner}/{repo}/pulls/{pr}/comments
-
-# Review threads with resolution state (GraphQL)
-gh api graphql -f query='
-  query($owner:String!,$repo:String!,$pr:Int!){
-    repository(owner:$owner,name:$repo){
-      pullRequest(number:$pr){
-        reviewThreads(first:100){
-          nodes{ id isResolved comments(first:50){ nodes{ id body author{login} } } }
-        }
-      }
-    }
-  }' -F owner={owner} -F repo={repo} -F pr={pr}
-```
-
-Reply to an inline review comment:
-
-```bash
-gh api repos/{owner}/{repo}/pulls/{pr}/comments/{comment_id}/replies \
-  -f body="Addressed in <commit>: <explanation>"
-```
-
-Resolve a review thread (needs the thread node id from the GraphQL query above):
-
-```bash
-gh api graphql -f query='
-  mutation($threadId:ID!){
-    resolveReviewThread(input:{threadId:$threadId}){ thread{ isResolved } }
-  }' -F threadId={thread_id}
-```

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

@@ -1,4 +1,4 @@
----
+---
 name: verify-samples-tool
 description: How to use the verify-samples tool to run, verify, and manage sample definitions in the Agent Framework repository. Use this when adding, updating, or running sample verification.
 ---
@@ -157,7 +157,7 @@ new SampleDefinition
 new SampleDefinition
 {
     Name = "Agent_With_AzureOpenAIChatCompletion",
-    ProjectPath = "samples/02-agents/AgentProviders/azure/Agent_With_AzureOpenAIChatCompletion",
+    ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion",
     RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
     OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
     ExpectedOutputDescription =
@@ -223,5 +223,3 @@ new SampleDefinition
     SkipReason = "Runs as an MCP stdio server that does not exit on its own.",
 },
 ```
-
-

dotnet/AGENTS.md

@@ -10,10 +10,6 @@ See `./.github/skills/build-and-test/SKILL.md` for detailed instructions on buil
 
 See `./.github/skills/project-structure/SKILL.md` for an overview of the project structure.
 
-## Pull Requests
-
-See `./.github/skills/pull-requests/SKILL.md` for guidance on writing PR descriptions and handling/resolving PR review comments.
-
 ### Core types
 
 - `AIAgent`: The abstract base class that all agents derive from, providing common methods for interacting with an agent.

dotnet/Directory.Packages.props

@@ -11,8 +11,8 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire.* -->
-    <PackageVersion Include="Anthropic" Version="12.35.1" />
-    <PackageVersion Include="Anthropic.Foundry" Version="0.7.1" />
+    <PackageVersion Include="Anthropic" Version="12.20.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" />
     <PackageVersion Include="Aspire.Azure.AI.Inference" Version="13.1.0-preview.1.25616.3" />
@@ -21,16 +21,15 @@
     <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
-    <PackageVersion Include="MessagePack" Version="3.1.7" /> <!-- Transitive dependency of Aspire pinned to newer version due to vulnerability in 2.5.192 -->
     <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.AgentServer.Core" Version="1.0.0-beta.26" />
-    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.5" />
-    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.6" />
+    <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.4" />
+    <PackageVersion Include="Azure.AI.Projects" Version="2.1.0-beta.2" />
     <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.10" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
-    <PackageVersion Include="Azure.Core" Version="1.60.0" />
+    <PackageVersion Include="Azure.Core" Version="1.56.0" />
     <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="DotNetEnv" Version="3.1.1" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
@@ -42,25 +41,19 @@
     <!-- Newtonsoft.Json -->
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <!-- System.* -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.9" />
+    <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.14.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.12.0" />
     <PackageVersion Include="System.CodeDom" Version="10.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.9" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.6" />
     <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.5" />
     <PackageVersion Include="System.Net.Http.Json" Version="10.0.0" />
-    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.8" />
-    <!-- AG-UI .NET SDK packages (published by the AG-UI team). -->
-    <PackageVersion Include="AGUI.Abstractions" Version="0.0.3" />
-    <PackageVersion Include="AGUI.Formatting" Version="0.0.3" />
-    <PackageVersion Include="AGUI.Protobuf" Version="0.0.3" />
-    <PackageVersion Include="AGUI.Client" Version="0.0.3" />
-    <PackageVersion Include="AGUI.Server" Version="0.0.3" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.9" />
-    <PackageVersion Include="System.Threading.Channels" Version="10.0.8" />
+    <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.6" />
+    <PackageVersion Include="System.Threading.Channels" Version="10.0.6" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
     <PackageVersion Include="System.Net.Security" Version="4.3.2" />
     <!-- OpenTelemetry -->
@@ -76,16 +69,15 @@
     <!-- Microsoft.AspNetCore.* -->
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.OpenApi" Version="2.7.5" /> <!-- Pin patched OpenAPI.NET to remediate GHSA-v5pm-xwqc-g5wc -->
+    <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.6.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.6.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation" Version="10.6.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.6.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="10.6.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.6.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.1" />
+    <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.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" />
@@ -94,12 +86,12 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0" />
@@ -107,7 +99,7 @@
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.67.0-preview" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.0-preview" />
     <!-- Agent SDKs -->
-    <PackageVersion Include="GitHub.Copilot.SDK" Version="1.0.5" />
+    <PackageVersion Include="GitHub.Copilot.SDK" Version="1.0.0-beta.2" />
     <PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.3.171-beta" />
     <!-- M365 Agents SDK -->
     <PackageVersion Include="AdaptiveCards" Version="3.1.0" />
@@ -117,7 +109,7 @@
     <PackageVersion Include="A2A" Version="1.0.0-preview2" />
     <PackageVersion Include="A2A.AspNetCore" Version="1.0.0-preview2" />
     <!-- MCP -->
-    <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
+    <PackageVersion Include="ModelContextProtocol" Version="1.1.0" />
     <!-- Hyperlight -->
     <PackageVersion Include="Hyperlight.HyperlightSandbox.Api" Version="0.4.0" />
     <PackageVersion Include="Hyperlight.HyperlightSandbox.Guest.Python" Version="0.4.0" />
@@ -127,7 +119,7 @@
     <PackageVersion Include="OllamaSharp" Version="5.4.8" />
     <PackageVersion Include="OpenAI" Version="2.10.0" />
     <!-- Identity -->
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.84.2" />
+    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.83.1" />
     <!-- Workflows -->
     <PackageVersion Include="Microsoft.Agents.ObjectModel" Version="2026.2.4.1" />
     <PackageVersion Include="Microsoft.Agents.ObjectModel.Json" Version="2026.2.4.1" />
@@ -146,15 +138,10 @@
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Mcp" Version="1.0.0" />
     <PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
-    <!-- Valkey -->
     <!-- Redis -->
     <PackageVersion Include="StackExchange.Redis" Version="2.10.1" />
-    <!-- Valkey -->
-    <PackageVersion Include="Valkey.Glide" Version="1.1.0" />
     <!-- Console UX -->
     <PackageVersion Include="Spectre.Console" Version="0.49.1" />
-    <!-- AWS -->
-    <PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.6.10" />
     <!-- Test -->
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.22" />

dotnet/agent-framework-dotnet.slnx

@@ -22,19 +22,20 @@
   </Folder>
   <Folder Name="/Samples/02-agents/AgentProviders/">
     <File Path="samples/02-agents/AgentProviders/README.md" />
-    <Project Path="samples/02-agents/AgentProviders/a2a/Agent_With_A2A/Agent_With_A2A.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/anthropic/Agent_With_Anthropic/Agent_With_Anthropic.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/azure/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/azure/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/azure/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/azure/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/custom/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/github-copilot/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/google-gemini/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/ollama/Agent_With_Ollama/Agent_With_Ollama.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/onnx/Agent_With_ONNX/Agent_With_ONNX.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_A2A/Agent_With_A2A.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_Anthropic/Agent_With_Anthropic.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent/Agent_With_AzureAIAgentsPersistent.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_AzureAIProject/Agent_With_AzureAIProject.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel/Agent_With_AzureFoundryModel.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion/Agent_With_AzureOpenAIChatCompletion.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses/Agent_With_AzureOpenAIResponses.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_CustomImplementation/Agent_With_CustomImplementation.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_GitHubCopilot/Agent_With_GitHubCopilot.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_GoogleGemini/Agent_With_GoogleGemini.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_Ollama/Agent_With_Ollama.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_ONNX/Agent_With_ONNX.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion/Agent_With_OpenAIChatCompletion.csproj" />
+    <Project Path="samples/02-agents/AgentProviders/Agent_With_OpenAIResponses/Agent_With_OpenAIResponses.csproj" />
   </Folder>
   <Folder Name="/Samples/05-end-to-end/DevUIAspireIntegration/">
     <Project Path="samples/05-end-to-end/DevUIAspireIntegration/DevUIIntegration.AppHost/DevUIIntegration.AppHost.csproj" />
@@ -117,13 +118,9 @@
     <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" />
-    <Project Path="samples/02-agents/AgentSkills/Agent_Step07_SkillsAutoApproval/Agent_Step07_SkillsAutoApproval.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/Harness/">
     <File Path="samples/02-agents/Harness/README.md" />
-    <Project Path="samples/02-agents/Harness/BuildYourOwnClaw/Claw_Step01_MeetYourClaw/Claw_Step01_MeetYourClaw.csproj" />
-    <Project Path="samples/02-agents/Harness/BuildYourOwnClaw/Claw_Step02_WorkingWithData/Claw_Step02_WorkingWithData.csproj" />
-    <Project Path="samples/02-agents/Harness/BuildYourOwnClaw/Claw_Step03_ScalingCapabilities/Claw_Step03_ScalingCapabilities.csproj" />
     <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" />
@@ -132,7 +129,6 @@
     <Project Path="samples/02-agents/Harness/Harness_Step02_Research_WithBackgroundAgents/Harness_Step02_Research_WithBackgroundAgents.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step03_DataProcessing/Harness_Step03_DataProcessing.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step04_CodeExecution/Harness_Step04_CodeExecution.csproj" />
-    <Project Path="samples/02-agents/Harness/Harness_Step05_Loop/Harness_Step05_Loop.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/AGUI/Step05_StateManagement/">
     <Project Path="samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj" />
@@ -142,43 +138,43 @@
     <File Path="samples/02-agents/DevUI/README.md" />
     <Project Path="samples/02-agents/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj" />
   </Folder>
-  <Folder Name="/Samples/02-agents/AgentProviders/anthropic/">
-    <File Path="samples/02-agents/AgentProviders/anthropic/README.md" />
-    <Project Path="samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj" />
+  <Folder Name="/Samples/02-agents/AgentWithAnthropic/">
+    <File Path="samples/02-agents/AgentWithAnthropic/README.md" />
+    <Project Path="samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running/Agent_Anthropic_Step01_Running.csproj" />
+    <Project Path="samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning/Agent_Anthropic_Step02_Reasoning.csproj" />
+    <Project Path="samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools/Agent_Anthropic_Step03_UsingFunctionTools.csproj" />
+    <Project Path="samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills/Agent_Anthropic_Step04_UsingSkills.csproj" />
   </Folder>
-  <Folder Name="/Samples/02-agents/AgentProviders/foundry/">
-    <File Path="samples/02-agents/AgentProviders/foundry/README.md" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step00_FoundryAgentLifecycle/Agent_Step00_FoundryAgentLifecycle.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step01_Basics/Agent_Step01_Basics.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step02.1_MultiturnConversation/Agent_Step02.1_MultiturnConversation.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step02.2_MultiturnWithServerConversations/Agent_Step02.2_MultiturnWithServerConversations.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step07_Observability/Agent_Step07_Observability.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step08_DependencyInjection/Agent_Step08_DependencyInjection.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step09_UsingMcpClientAsTools/Agent_Step09_UsingMcpClientAsTools.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step10_UsingImages/Agent_Step10_UsingImages.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step11_AsFunctionTool/Agent_Step11_AsFunctionTool.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step12_Middleware/Agent_Step12_Middleware.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step13_Plugins/Agent_Step13_Plugins.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step14_CodeInterpreter/Agent_Step14_CodeInterpreter.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step15_ComputerUse/Agent_Step15_ComputerUse.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step16_FileSearch/Agent_Step16_FileSearch.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step17_OpenAPITools/Agent_Step17_OpenAPITools.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step18_BingCustomSearch/Agent_Step18_BingCustomSearch.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step19_SharePoint/Agent_Step19_SharePoint.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step20_MicrosoftFabric/Agent_Step20_MicrosoftFabric.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step21_WebSearch/Agent_Step21_WebSearch.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step22_MemorySearch/Agent_Step22_MemorySearch.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step23_LocalMCP/Agent_Step23_LocalMCP.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step24_CodeInterpreterFileDownload/Agent_Step24_CodeInterpreterFileDownload.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step25_FoundryToolboxMcp/Agent_Step25_FoundryToolboxMcp.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/foundry/Agent_Step26_FoundryToolboxMcpSkills/Agent_Step26_FoundryToolboxMcpSkills.csproj" />
+  <Folder Name="/Samples/02-agents/AgentsWithFoundry/">
+    <File Path="samples/02-agents/AgentsWithFoundry/README.md" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step00_FoundryAgentLifecycle/Agent_Step00_FoundryAgentLifecycle.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step01_Basics/Agent_Step01_Basics.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step02.1_MultiturnConversation/Agent_Step02.1_MultiturnConversation.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step02.2_MultiturnWithServerConversations/Agent_Step02.2_MultiturnWithServerConversations.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step07_Observability/Agent_Step07_Observability.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step08_DependencyInjection/Agent_Step08_DependencyInjection.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step09_UsingMcpClientAsTools/Agent_Step09_UsingMcpClientAsTools.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step10_UsingImages/Agent_Step10_UsingImages.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step11_AsFunctionTool/Agent_Step11_AsFunctionTool.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step12_Middleware/Agent_Step12_Middleware.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step13_Plugins/Agent_Step13_Plugins.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step14_CodeInterpreter/Agent_Step14_CodeInterpreter.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step15_ComputerUse/Agent_Step15_ComputerUse.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step16_FileSearch/Agent_Step16_FileSearch.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step17_OpenAPITools/Agent_Step17_OpenAPITools.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step18_BingCustomSearch/Agent_Step18_BingCustomSearch.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step19_SharePoint/Agent_Step19_SharePoint.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step20_MicrosoftFabric/Agent_Step20_MicrosoftFabric.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step21_WebSearch/Agent_Step21_WebSearch.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step22_MemorySearch/Agent_Step22_MemorySearch.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step23_LocalMCP/Agent_Step23_LocalMCP.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step24_CodeInterpreterFileDownload/Agent_Step24_CodeInterpreterFileDownload.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/Agent_Step25_FoundryToolboxMcp.csproj" />
+    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step26_FoundryToolboxMcpSkills/Agent_Step26_FoundryToolboxMcpSkills.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/Evaluation/">
     <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
@@ -196,19 +192,17 @@
     <File Path="samples/02-agents/AgentWithMemory/README.md" />
     <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
     <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj" />
-    <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step03_MemoryUsingValkey/AgentWithMemory_Step03_MemoryUsingValkey.csproj" />
-    <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step03_MemoryUsingValkey_Bedrock/AgentWithMemory_Step03_MemoryUsingValkey_Bedrock.csproj" />
     <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step04_MemoryUsingFoundry/AgentWithMemory_Step04_MemoryUsingFoundry.csproj" />
     <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step05_BoundedChatHistory/AgentWithMemory_Step05_BoundedChatHistory.csproj" />
   </Folder>
-  <Folder Name="/Samples/02-agents/AgentProviders/openai/">
-    <File Path="samples/02-agents/AgentProviders/openai/README.md" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj" />
-    <Project Path="samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step06_CodeInterpreterFileDownload/Agent_OpenAI_Step06_CodeInterpreterFileDownload.csproj" />
+  <Folder Name="/Samples/02-agents/AgentWithOpenAI/">
+    <File Path="samples/02-agents/AgentWithOpenAI/README.md" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning/Agent_OpenAI_Step02_Reasoning.csproj" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient/Agent_OpenAI_Step03_CreateFromChatClient.csproj" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient.csproj" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation/Agent_OpenAI_Step05_Conversation.csproj" />
+    <Project Path="samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step06_CodeInterpreterFileDownload/Agent_OpenAI_Step06_CodeInterpreterFileDownload.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/AgentWithRAG/">
     <File Path="samples/02-agents/AgentWithRAG/README.md" />
@@ -221,7 +215,6 @@
   <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_PerRun_AuthHeaders/Agent_MCP_PerRun_AuthHeaders.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" />
@@ -244,10 +237,10 @@
   </Folder>
   <Folder Name="/Samples/03-workflows/Declarative/">
     <File Path="samples/03-workflows/Declarative/README.md" />
-    <Project Path="samples/03-workflows/Declarative/AotCheckpointing/AotCheckpointing.csproj" />
     <Project Path="samples/03-workflows/Declarative/ConfirmInput/ConfirmInput.csproj" />
     <Project Path="samples/03-workflows/Declarative/CustomerSupport/CustomerSupport.csproj" />
     <Project Path="samples/03-workflows/Declarative/DeepResearch/DeepResearch.csproj" />
+    <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/HostedWorkflow/HostedWorkflow.csproj" />
@@ -336,9 +329,6 @@
   <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-LocalCodeAct/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-LocalCodeAct/HostedLocalCodeAct.csproj" />
-  </Folder>
   <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-McpTools/">
     <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-McpTools/HostedMcpTools.csproj" />
   </Folder>
@@ -354,12 +344,6 @@
   <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox/">
     <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox/HostedToolbox.csproj" />
   </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox-AuthPaths/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Toolbox-AuthPaths/Hosted-Toolbox-AuthPaths.csproj" />
-  </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-ToolboxMcpSkills/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-ToolboxMcpSkills/HostedToolboxMcpSkills.csproj" />
-  </Folder>
   <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-AzureSearchRag/">
     <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-AzureSearchRag/HostedAzureSearchRag.csproj" />
   </Folder>
@@ -370,7 +354,6 @@
     <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/Hosted-Toolbox-AuthPaths-Client/Hosted-Toolbox-AuthPaths-Client.csproj" />
     <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>
@@ -417,7 +400,6 @@
   <Folder Name="/Samples/05-end-to-end/Evaluation/">
     <Project Path="samples/05-end-to-end/Evaluation/Evaluation_ConversationSplits/Evaluation_ConversationSplits.csproj" />
     <Project Path="samples/05-end-to-end/Evaluation/Evaluation_FoundryQuality/Evaluation_FoundryQuality.csproj" />
-    <Project Path="samples/05-end-to-end/Evaluation/Evaluation_FoundryRubric/Evaluation_FoundryRubric.csproj" />
     <Project Path="samples/05-end-to-end/Evaluation/Evaluation_MixedProviders/Evaluation_MixedProviders.csproj" />
   </Folder>
   <Folder Name="/Samples/05-end-to-end/A2AClientServer/">
@@ -606,6 +588,7 @@
     <Project Path="src/Aspire.Hosting.AgentFramework.DevUI/Aspire.Hosting.AgentFramework.DevUI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.A2A/Microsoft.Agents.AI.A2A.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Abstractions/Microsoft.Agents.AI.Abstractions.csproj" />
+    <Project Path="src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Anthropic/Microsoft.Agents.AI.Anthropic.csproj" />
     <Project Path="src/Microsoft.Agents.AI.AzureAI.Persistent/Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
     <Project Path="src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj" />
@@ -620,18 +603,16 @@
     <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.AspNetCore/Microsoft.Agents.AI.Hosting.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.LocalCodeAct/Microsoft.Agents.AI.LocalCodeAct.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.Valkey/Microsoft.Agents.AI.Valkey.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" />
@@ -664,6 +645,7 @@
     <Project Path="tests/Aspire.Hosting.AgentFramework.DevUI.UnitTests/Aspire.Hosting.AgentFramework.DevUI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Anthropic.UnitTests/Microsoft.Agents.AI.Anthropic.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.CosmosNoSql.UnitTests/Microsoft.Agents.AI.CosmosNoSql.UnitTests.csproj" />
@@ -680,19 +662,15 @@
     <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.LocalCodeAct.UnitTests/Microsoft.Agents.AI.LocalCodeAct.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.Valkey.UnitTests/Microsoft.Agents.AI.Valkey.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" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Generators.UnitTests/Microsoft.Agents.AI.Workflows.Generators.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.UnitTests/Microsoft.Agents.AI.Workflows.UnitTests.csproj" />
   </Folder>
 </Solution>
-
-

dotnet/agent-framework-release.slnf

@@ -4,6 +4,7 @@
     "projects": [
       "src\\Microsoft.Agents.AI.A2A\\Microsoft.Agents.AI.A2A.csproj",
       "src\\Microsoft.Agents.AI.Abstractions\\Microsoft.Agents.AI.Abstractions.csproj",
+      "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",
@@ -28,7 +29,6 @@
       "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.Valkey\\Microsoft.Agents.AI.Valkey.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",

dotnet/eng/verify-samples/AgentsSamples.cs

@@ -14,7 +14,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_CustomImplementation",
-            ProjectPath = "samples/02-agents/AgentProviders/custom/Agent_With_CustomImplementation",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_CustomImplementation",
             RequiredEnvironmentVariables = [],
             ExpectedOutputDescription =
             [
@@ -27,7 +27,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_AzureOpenAIChatCompletion",
-            ProjectPath = "samples/02-agents/AgentProviders/azure/Agent_With_AzureOpenAIChatCompletion",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureOpenAIChatCompletion",
             RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -40,7 +40,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_AzureOpenAIResponses",
-            ProjectPath = "samples/02-agents/AgentProviders/azure/Agent_With_AzureOpenAIResponses",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureOpenAIResponses",
             RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -50,10 +50,23 @@ internal static class AgentsSamples
             ],
         },
 
+        new SampleDefinition
+        {
+            Name = "Agent_With_AzureAIAgentsPersistent",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureAIAgentsPersistent",
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+            ExpectedOutputDescription =
+            [
+                "The output should contain a joke about a pirate.",
+                "The output should not contain error messages or stack traces.",
+            ],
+        },
+
         new SampleDefinition
         {
             Name = "Agent_With_AzureAIProject",
-            ProjectPath = "samples/02-agents/AgentProviders/azure/Agent_With_AzureAIProject",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureAIProject",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             MustContain = ["Latest agent version id:"],
@@ -67,7 +80,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_AzureFoundryModel",
-            ProjectPath = "samples/02-agents/AgentProviders/azure/Agent_With_AzureFoundryModel",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_AzureFoundryModel",
             RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_OPENAI_API_KEY", "AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -335,8 +348,8 @@ internal static class AgentsSamples
         {
             Name = "Agent_Step01_FileBasedSkills",
             ProjectPath = "samples/02-agents/AgentSkills/Agent_Step01_FileBasedSkills",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain =
             [
                 "Converting units with file-based skills",
@@ -354,8 +367,8 @@ internal static class AgentsSamples
         {
             Name = "Agent_Step06_McpBasedSkills",
             ProjectPath = "samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain =
             [
                 "Discovering MCP-based skills",
@@ -477,12 +490,12 @@ internal static class AgentsSamples
             ],
         },
 
-        // ── Foundry ───────────────────────────────────────────────────────────
+        // ── AgentsWithFoundry ────────────────────────────────────────────────
 
         new SampleDefinition
         {
             Name = "FoundryAgent_Step00_FoundryAgentLifecycle",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step00_FoundryAgentLifecycle",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step00_FoundryAgentLifecycle",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -495,7 +508,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step01_Basics",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step01_Basics",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step01_Basics",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -508,7 +521,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step02.1_MultiturnConversation",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step02.1_MultiturnConversation",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step02.1_MultiturnConversation",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -522,7 +535,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step02.2_MultiturnWithServerConversations",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step02.2_MultiturnWithServerConversations",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step02.2_MultiturnWithServerConversations",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -535,7 +548,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step03_UsingFunctionTools",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step03_UsingFunctionTools",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step03_UsingFunctionTools",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -550,7 +563,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step04_UsingFunctionToolsWithApprovals",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step04_UsingFunctionToolsWithApprovals",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step04_UsingFunctionToolsWithApprovals",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["Y", "Y", "Y"],
@@ -566,7 +579,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step05_StructuredOutput",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step05_StructuredOutput",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step05_StructuredOutput",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             MustContain = ["Assistant Output:", "Name:"],
@@ -581,7 +594,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step06_PersistedConversations",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step06_PersistedConversations",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step06_PersistedConversations",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -594,7 +607,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step08_DependencyInjection",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step08_DependencyInjection",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step08_DependencyInjection",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["Tell me a joke about a pirate", ""],
@@ -609,7 +622,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step10_UsingImages",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step10_UsingImages",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step10_UsingImages",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -623,7 +636,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step11_AsFunctionTool",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step11_AsFunctionTool",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step11_AsFunctionTool",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -637,7 +650,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step12_Middleware",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step12_Middleware",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step12_Middleware",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["Y", "Y", "Y"],
@@ -653,7 +666,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step13_Plugins",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step13_Plugins",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step13_Plugins",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -667,7 +680,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step14_CodeInterpreter",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step14_CodeInterpreter",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step14_CodeInterpreter",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -682,7 +695,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step16_FileSearch",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step16_FileSearch",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step16_FileSearch",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             MustContain = ["--- Running File Search Agent ---"],
@@ -696,12 +709,12 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step17_OpenAPITools",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step17_OpenAPITools",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step17_OpenAPITools",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
-                "The output should contain the current EUR exchange rate against USD and GBP as numeric values.",
+                "The output should contain a list of countries or information about countries that use the EUR currency.",
                 "The output should not contain error messages or stack traces.",
             ],
         },
@@ -720,7 +733,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_A2A",
-            ProjectPath = "samples/02-agents/AgentProviders/a2a/Agent_With_A2A",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_A2A",
             RequiredEnvironmentVariables = ["A2A_AGENT_HOST"],
             SkipReason = "Requires an external A2A agent host.",
         },
@@ -728,7 +741,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_Anthropic",
-            ProjectPath = "samples/02-agents/AgentProviders/anthropic/Agent_With_Anthropic",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_Anthropic",
             RequiredEnvironmentVariables = ["ANTHROPIC_API_KEY"],
             OptionalEnvironmentVariables = ["ANTHROPIC_CHAT_MODEL_NAME", "ANTHROPIC_RESOURCE"],
             ExpectedOutputDescription =
@@ -741,7 +754,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_GitHubCopilot",
-            ProjectPath = "samples/02-agents/AgentProviders/github-copilot/Agent_With_GitHubCopilot",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_GitHubCopilot",
             RequiredEnvironmentVariables = [],
             // The sample prompts for shell command approval; provide "Y" for each possible permission request
             Inputs = ["Y", "Y", "Y"],
@@ -756,7 +769,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_GoogleGemini",
-            ProjectPath = "samples/02-agents/AgentProviders/google-gemini/Agent_With_GoogleGemini",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_GoogleGemini",
             RequiredEnvironmentVariables = ["GOOGLE_GENAI_API_KEY"],
             OptionalEnvironmentVariables = ["GOOGLE_GENAI_MODEL"],
             MustContain =
@@ -774,7 +787,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_ONNX",
-            ProjectPath = "samples/02-agents/AgentProviders/onnx/Agent_With_ONNX",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_ONNX",
             RequiredEnvironmentVariables = ["ONNX_MODEL_PATH"],
             SkipReason = "Requires local ONNX model.",
         },
@@ -782,7 +795,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_Ollama",
-            ProjectPath = "samples/02-agents/AgentProviders/ollama/Agent_With_Ollama",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_Ollama",
             RequiredEnvironmentVariables = ["OLLAMA_ENDPOINT", "OLLAMA_MODEL_NAME"],
             SkipReason = "Requires local Ollama server.",
         },
@@ -790,7 +803,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_OpenAIChatCompletion",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_With_OpenAIChatCompletion",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_OpenAIChatCompletion",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -803,7 +816,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_With_OpenAIResponses",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_With_OpenAIResponses",
+            ProjectPath = "samples/02-agents/AgentProviders/Agent_With_OpenAIResponses",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -837,13 +850,13 @@ internal static class AgentsSamples
             ProjectPath = "samples/02-agents/Agents/Agent_Step15_DeepResearch",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT", "AZURE_AI_MODEL_DEPLOYMENT_NAME", "AZURE_AI_BING_CONNECTION_ID"],
             OptionalEnvironmentVariables = ["AZURE_AI_REASONING_DEPLOYMENT_NAME"],
-            SkipReason = "Requires Microsoft Foundry project with Bing search connection.",
+            SkipReason = "Requires Azure AI Foundry project with Bing search connection.",
         },
 
         new SampleDefinition
         {
             Name = "Agent_Anthropic_Step01_Running",
-            ProjectPath = "samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step01_Running",
+            ProjectPath = "samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step01_Running",
             RequiredEnvironmentVariables = ["ANTHROPIC_API_KEY"],
             OptionalEnvironmentVariables = ["ANTHROPIC_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -857,7 +870,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_Anthropic_Step02_Reasoning",
-            ProjectPath = "samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step02_Reasoning",
+            ProjectPath = "samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step02_Reasoning",
             RequiredEnvironmentVariables = ["ANTHROPIC_API_KEY"],
             OptionalEnvironmentVariables = ["ANTHROPIC_CHAT_MODEL_NAME"],
             MustContain =
@@ -880,7 +893,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_Anthropic_Step03_UsingFunctionTools",
-            ProjectPath = "samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step03_UsingFunctionTools",
+            ProjectPath = "samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step03_UsingFunctionTools",
             RequiredEnvironmentVariables = ["ANTHROPIC_API_KEY"],
             OptionalEnvironmentVariables = ["ANTHROPIC_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -894,7 +907,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_Anthropic_Step04_UsingSkills",
-            ProjectPath = "samples/02-agents/AgentProviders/anthropic/Agent_Anthropic_Step04_UsingSkills",
+            ProjectPath = "samples/02-agents/AgentWithAnthropic/Agent_Anthropic_Step04_UsingSkills",
             RequiredEnvironmentVariables = ["ANTHROPIC_API_KEY"],
             OptionalEnvironmentVariables = ["ANTHROPIC_CHAT_MODEL_NAME"],
             MustContain =
@@ -921,7 +934,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_OpenAI_Step01_Running",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step01_Running",
+            ProjectPath = "samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step01_Running",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -934,7 +947,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_OpenAI_Step02_Reasoning",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step02_Reasoning",
+            ProjectPath = "samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step02_Reasoning",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             MustContain =
@@ -954,7 +967,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_OpenAI_Step03_CreateFromChatClient",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step03_CreateFromChatClient",
+            ProjectPath = "samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step03_CreateFromChatClient",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -968,7 +981,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_OpenAI_Step04_CreateFromOpenAIResponseClient",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient",
+            ProjectPath = "samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             ExpectedOutputDescription =
@@ -982,7 +995,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "Agent_OpenAI_Step05_Conversation",
-            ProjectPath = "samples/02-agents/AgentProviders/openai/Agent_OpenAI_Step05_Conversation",
+            ProjectPath = "samples/02-agents/AgentWithOpenAI/Agent_OpenAI_Step05_Conversation",
             RequiredEnvironmentVariables = ["OPENAI_API_KEY"],
             OptionalEnvironmentVariables = ["OPENAI_CHAT_MODEL_NAME"],
             MustContain =
@@ -1029,7 +1042,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step07_Observability",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step07_Observability",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step07_Observability",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME", "APPLICATIONINSIGHTS_CONNECTION_STRING"],
             SkipReason = "Requires Application Insights / OpenTelemetry infrastructure.",
@@ -1038,7 +1051,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step09_UsingMcpClientAsTools",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step09_UsingMcpClientAsTools",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step09_UsingMcpClientAsTools",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -1051,16 +1064,16 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step15_ComputerUse",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step15_ComputerUse",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT", "AZURE_AI_COMPUTER_USE_DEPLOYMENT_NAME"],
-            OptionalEnvironmentVariables = [],
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step15_ComputerUse",
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription = ["The output should show a computer automation session processing simulated browser screenshots with iteration steps and a final response describing search results."],
         },
 
         new SampleDefinition
         {
             Name = "FoundryAgent_Step18_BingCustomSearch",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step18_BingCustomSearch",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step18_BingCustomSearch",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT", "AZURE_AI_MODEL_DEPLOYMENT_NAME", "AZURE_AI_CUSTOM_SEARCH_CONNECTION_ID", "AZURE_AI_CUSTOM_SEARCH_INSTANCE_NAME"],
             SkipReason = "Requires Bing Custom Search connection.",
         },
@@ -1068,7 +1081,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step19_SharePoint",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step19_SharePoint",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step19_SharePoint",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT", "AZURE_AI_MODEL_DEPLOYMENT_NAME", "SHAREPOINT_PROJECT_CONNECTION_ID"],
             SkipReason = "Requires SharePoint connection.",
         },
@@ -1076,7 +1089,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step20_MicrosoftFabric",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step20_MicrosoftFabric",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step20_MicrosoftFabric",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT", "AZURE_AI_MODEL_DEPLOYMENT_NAME", "FABRIC_PROJECT_CONNECTION_ID"],
             SkipReason = "Requires Microsoft Fabric connection.",
         },
@@ -1084,7 +1097,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step21_WebSearch",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step21_WebSearch",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step21_WebSearch",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
@@ -1097,7 +1110,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step22_MemorySearch",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step22_MemorySearch",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step22_MemorySearch",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT", "AZURE_AI_MODEL_DEPLOYMENT_NAME", "AZURE_AI_EMBEDDING_DEPLOYMENT_NAME"],
             OptionalEnvironmentVariables = ["AZURE_AI_MEMORY_STORE_ID"],
             MustContain = ["Agent created with Memory Search tool. Starting conversation..."],
@@ -1111,7 +1124,7 @@ internal static class AgentsSamples
         new SampleDefinition
         {
             Name = "FoundryAgent_Step23_LocalMCP",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step23_LocalMCP",
+            ProjectPath = "samples/02-agents/AgentsWithFoundry/Agent_Step23_LocalMCP",
             RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             ExpectedOutputDescription = ["The output should show an agent using the Microsoft Learn MCP server to search for documentation and provide a response."],

dotnet/eng/verify-samples/GetStartedSamples.cs

@@ -26,8 +26,8 @@ internal static class GetStartedSamples
         {
             Name = "01_hello_agent",
             ProjectPath = "samples/01-get-started/01_hello_agent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should contain a joke about a pirate.",
@@ -40,8 +40,8 @@ internal static class GetStartedSamples
         {
             Name = "02_add_tools",
             ProjectPath = "samples/01-get-started/02_add_tools",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain = [],
             ExpectedOutputDescription =
             [
@@ -56,8 +56,8 @@ internal static class GetStartedSamples
         {
             Name = "03_multi_turn",
             ProjectPath = "samples/01-get-started/03_multi_turn",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should contain a joke about a pirate.",
@@ -71,8 +71,8 @@ internal static class GetStartedSamples
         {
             Name = "04_memory",
             ProjectPath = "samples/01-get-started/04_memory",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain =
             [
                 ">> Use session with blank memory",
@@ -97,8 +97,8 @@ internal static class GetStartedSamples
         {
             Name = "06_host_your_agent",
             ProjectPath = "samples/01-get-started/06_host_your_agent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             SkipReason = "Requires Azure Functions Core Tools runtime and starts a web server.",
         },
     ];

dotnet/eng/verify-samples/Program.cs

@@ -18,14 +18,13 @@
 // Note: By default, this tool expects sample build outputs to already exist.
 // Pre-build the solution before running, or pass --build to avoid missing build output failures.
 //
-// Required environment variables (for AI-powered verification):
-//   FOUNDRY_PROJECT_ENDPOINT  — Your Microsoft Foundry project endpoint
-//   FOUNDRY_MODEL             — Model deployment name (optional, defaults to gpt-5.4-mini)
+// Required environment variables (for AI-powered samples):
+//   AZURE_OPENAI_ENDPOINT
+//   AZURE_OPENAI_DEPLOYMENT_NAME (optional, defaults to gpt-5-mini)
 
 using System.Diagnostics;
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
-using Microsoft.Agents.AI;
 using VerifySamples;
 
 var options = VerifyOptions.Parse(args);
@@ -44,33 +43,14 @@ if (!File.Exists(Path.Combine(dotnetRoot, "agent-framework-dotnet.slnx")))
 }
 
 // Set up the AI verifier
-var foundryEndpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT");
-var foundryModel = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5-mini";
 
-AIAgent? verifierAgent = null;
-if (!string.IsNullOrEmpty(foundryEndpoint))
+OpenAI.Chat.ChatClient? chatClient = null;
+if (!string.IsNullOrEmpty(endpoint))
 {
-    verifierAgent = new AIProjectClient(new Uri(foundryEndpoint), new DefaultAzureCredential())
-        .AsAIAgent(
-            model: foundryModel,
-            instructions: """
-                You are a test output verifier. You will be given:
-                1. The actual stdout output of a program
-                2. The stderr output (if any)
-                3. A list of expectations about what the output should contain or demonstrate
-
-                Your job is to determine whether the actual output satisfies each expectation.
-                Be reasonable — the output comes from an LLM so exact wording won't match, but the
-                semantic intent should be clearly satisfied.
-
-                In your response, you MUST:
-                - Always provide ai_reasoning with a brief overall assessment.
-                - Always provide exactly one entry in expectation_results for each expectation,
-                  in the same order as the input list.
-                - For each expectation_results entry, echo the expectation text in the expectation
-                  field and explain your assessment in the detail field, citing evidence from the output.
-                """,
-            name: "OutputVerifier");
+    chatClient = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
+        .GetChatClient(deploymentName);
 }
 
 // Set up optional log file writer
@@ -81,13 +61,11 @@ if (options.LogFilePath is not null)
     await logWriter.WriteHeaderAsync();
 }
 
-Console.WriteLine($"Foundry endpoint: {foundryEndpoint ?? "(not set — AI verification disabled)"}, Model: {foundryModel}");
-
 try
 {
     // Run all samples
     var reporter = new ConsoleReporter();
-    var verifier = new SampleVerifier(verifierAgent);
+    var verifier = new SampleVerifier(chatClient);
     var orchestrator = new VerificationOrchestrator(verifier, reporter, dotnetRoot, TimeSpan.FromMinutes(3), logWriter, buildSamples: options.BuildSamples);
 
     var run = await orchestrator.RunAllAsync(options.Samples, options.MaxParallelism);

dotnet/eng/verify-samples/SampleVerifier.cs

@@ -3,6 +3,8 @@
 using System.ComponentModel;
 using System.Text.Json.Serialization;
 using Microsoft.Agents.AI;
+using Microsoft.Extensions.AI;
+using OpenAI.Chat;
 
 namespace VerifySamples;
 
@@ -15,12 +17,33 @@ internal sealed class SampleVerifier
     private readonly AIAgent? _verifierAgent;
 
     /// <summary>
-    /// Creates a verifier. If <paramref name="verifierAgent"/> is provided,
+    /// Creates a verifier. If <paramref name="chatClient"/> is provided,
     /// AI-based verification is available for non-deterministic samples.
     /// </summary>
-    public SampleVerifier(AIAgent? verifierAgent = null)
+    public SampleVerifier(ChatClient? chatClient = null)
     {
-        this._verifierAgent = verifierAgent;
+        if (chatClient is not null)
+        {
+            this._verifierAgent = chatClient.AsAIAgent(
+                instructions: """
+                    You are a test output verifier. You will be given:
+                    1. The actual stdout output of a program
+                    2. The stderr output (if any)
+                    3. A list of expectations about what the output should contain or demonstrate
+
+                    Your job is to determine whether the actual output satisfies each expectation.
+                    Be reasonable — the output comes from an LLM so exact wording won't match, but the
+                    semantic intent should be clearly satisfied.
+
+                    In your response, you MUST:
+                    - Always provide ai_reasoning with a brief overall assessment.
+                    - Always provide exactly one entry in expectation_results for each expectation,
+                      in the same order as the input list.
+                    - For each expectation_results entry, echo the expectation text in the expectation
+                      field and explain your assessment in the detail field, citing evidence from the output.
+                    """,
+                name: "OutputVerifier");
+        }
     }
 
     /// <summary>

dotnet/eng/verify-samples/WorkflowSamples.cs

@@ -30,8 +30,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_StartHere_02_AgentsInWorkflows",
             ProjectPath = "samples/03-workflows/_StartHere/02_AgentsInWorkflows",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show agent responses from a translation workflow.",
@@ -43,8 +43,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_StartHere_03_AgentWorkflowPatterns",
             ProjectPath = "samples/03-workflows/_StartHere/03_AgentWorkflowPatterns",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             Inputs = ["sequential"],
             InputDelayMs = 3000,
             ExpectedOutputDescription =
@@ -81,8 +81,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_StartHere_06_MixedWorkflowAgentsAndExecutors",
             ProjectPath = "samples/03-workflows/_StartHere/06_MixedWorkflowAgentsAndExecutors",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             Inputs = ["What is 2 plus 2?"],
             InputDelayMs = 3000,
             ExpectedOutputDescription =
@@ -96,8 +96,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_StartHere_07_WriterCriticWorkflow",
             ProjectPath = "samples/03-workflows/_StartHere/07_WriterCriticWorkflow",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain = ["=== Writer-Critic Iteration Workflow ==="],
             ExpectedOutputDescription =
             [
@@ -115,8 +115,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Agents_CustomAgentExecutors",
             ProjectPath = "samples/03-workflows/Agents/CustomAgentExecutors",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show custom workflow events including slogan generation and feedback.",
@@ -128,17 +128,17 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Agents_FoundryAgent",
             ProjectPath = "samples/03-workflows/Agents/FoundryAgent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
-            SkipReason = "Requires Microsoft Foundry project endpoint.",
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+            SkipReason = "Requires Azure AI Foundry project endpoint.",
         },
 
         new SampleDefinition
         {
             Name = "Workflow_Agents_GroupChatToolApproval",
             ProjectPath = "samples/03-workflows/Agents/GroupChatToolApproval",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             MustContain = ["Starting group chat workflow for software deployment..."],
             ExpectedOutputDescription =
             [
@@ -153,8 +153,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Agents_WorkflowAsAnAgent",
             ProjectPath = "samples/03-workflows/Agents/WorkflowAsAnAgent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             Inputs = ["hello", "exit"],
             InputDelayMs = 5000,
             ExpectedOutputDescription =
@@ -219,8 +219,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Concurrent_Concurrent",
             ProjectPath = "samples/03-workflows/Concurrent/Concurrent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show results from concurrent agent processing.",
@@ -247,8 +247,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_ConditionalEdges_01_EdgeCondition",
             ProjectPath = "samples/03-workflows/ConditionalEdges/01_EdgeCondition",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show an email being classified as spam or not spam and processed accordingly.",
@@ -260,8 +260,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_ConditionalEdges_02_SwitchCase",
             ProjectPath = "samples/03-workflows/ConditionalEdges/02_SwitchCase",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show an ambiguous email being classified as spam, not spam, or uncertain.",
@@ -273,8 +273,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_ConditionalEdges_03_MultiSelection",
             ProjectPath = "samples/03-workflows/ConditionalEdges/03_MultiSelection",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             ExpectedOutputDescription =
             [
                 "The output should show an email being classified and potentially routed to multiple handlers.",
@@ -371,8 +371,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Observability_WorkflowAsAnAgent",
             ProjectPath = "samples/03-workflows/Observability/WorkflowAsAnAgent",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_OPENAI_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_OPENAI_DEPLOYMENT_NAME"],
             SkipReason = "Interactive console with ReadLine loop; requires OTLP endpoint.",
         },
 
@@ -384,7 +384,7 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_ConfirmInput",
             ProjectPath = "samples/03-workflows/Declarative/ConfirmInput",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             Inputs = ["hello", "hello"],
             InputDelayMs = 8000,
             ExpectedOutputDescription = ["The output should show a confirmation prompt and a user response."],
@@ -394,10 +394,10 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_CustomerSupport",
             ProjectPath = "samples/03-workflows/Declarative/CustomerSupport",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
-            Inputs = ["My laptop won't start", "The laptop is now working, thank you!"],
-            InputDelayMs = 5000,
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+            Inputs = ["My laptop won't start"],
+            InputDelayMs = 3000,
             ExpectedOutputDescription = ["The output should show a customer support workflow processing a laptop issue, with agent responses providing troubleshooting or support."],
         },
 
@@ -405,16 +405,26 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_DeepResearch",
             ProjectPath = "samples/03-workflows/Declarative/DeepResearch",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             SkipReason = "Requires external weather API (wttr.in).",
         },
 
+        new SampleDefinition
+        {
+            Name = "Workflow_Declarative_ExecuteCode",
+            ProjectPath = "samples/03-workflows/Declarative/ExecuteCode",
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            Inputs = ["What is 12 * 34?"],
+            InputDelayMs = 5000,
+            ExpectedOutputDescription = ["The output should show a declarative workflow executing generated code, processing a math question and producing a result."],
+        },
+
         new SampleDefinition
         {
             Name = "Workflow_Declarative_ExecuteWorkflow",
             ProjectPath = "samples/03-workflows/Declarative/ExecuteWorkflow",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             SkipReason = "Requires a workflow file path as a CLI argument.",
         },
 
@@ -422,8 +432,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_FunctionTools",
             ProjectPath = "samples/03-workflows/Declarative/FunctionTools",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["What are today's specials?", "EXIT"],
             InputDelayMs = 8000,
             ExpectedOutputDescription = ["The output should show a workflow calling function tools (e.g. a menu plugin) to answer a question about restaurant specials."],
@@ -433,7 +443,7 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_HostedWorkflow",
             ProjectPath = "samples/03-workflows/Declarative/HostedWorkflow",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
             SkipReason = "Hosts a persistent workflow server that does not exit.",
         },
 
@@ -441,9 +451,9 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_InputArguments",
             ProjectPath = "samples/03-workflows/Declarative/InputArguments",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
-            Inputs = ["I'd like to visit Seattle", "Seattle, WA", "EXIT"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+            Inputs = ["I'd like to visit Seattle", "EXIT"],
             InputDelayMs = 8000,
             ExpectedOutputDescription = ["The output should show a workflow capturing location input and providing travel-related information about Seattle."],
         },
@@ -452,8 +462,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_InvokeFunctionTool",
             ProjectPath = "samples/03-workflows/Declarative/InvokeFunctionTool",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["What's the soup of the day?", "EXIT"],
             InputDelayMs = 8000,
             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."],
@@ -463,8 +473,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_InvokeFoundryToolboxMcp",
             ProjectPath = "samples/03-workflows/Declarative/InvokeFoundryToolboxMcp",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL", "FOUNDRY_TOOLBOX_NAME", "FOUNDRY_AGENT_TOOLSET_API_VERSION"],
+            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."],
@@ -474,8 +484,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_InvokeMcpTool",
             ProjectPath = "samples/03-workflows/Declarative/InvokeMcpTool",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["Search for .NET tutorials on Microsoft Learn"],
             InputDelayMs = 3000,
             ExpectedOutputDescription = ["The output should show a workflow using MCP tools to search Microsoft Learn documentation and provide a summary of results."],
@@ -485,8 +495,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_Marketing",
             ProjectPath = "samples/03-workflows/Declarative/Marketing",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["A smart water bottle that tracks hydration"],
             InputDelayMs = 3000,
             ExpectedOutputDescription = ["The output should show a marketing workflow generating content about a smart water bottle product."],
@@ -496,8 +506,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_StudentTeacher",
             ProjectPath = "samples/03-workflows/Declarative/StudentTeacher",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["What is 18 + 27?"],
             InputDelayMs = 3000,
             ExpectedOutputDescription = ["The output should show a student-teacher workflow where a student asks a math question and a teacher provides the answer."],
@@ -507,8 +517,8 @@ internal static class WorkflowSamples
         {
             Name = "Workflow_Declarative_ToolApproval",
             ProjectPath = "samples/03-workflows/Declarative/ToolApproval",
-            RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
-            OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
+            RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
+            OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
             Inputs = ["Search for .NET tutorials", "EXIT"],
             InputDelayMs = 8000,
             ExpectedOutputDescription = ["The output should show a workflow using an MCP tool with approval to search Microsoft Learn, followed by an exit from the input loop."],

dotnet/eng/verify-samples/verify-samples.csproj

@@ -12,12 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.AI.Projects" />
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>

dotnet/global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "10.0.301",
+        "version": "10.0.200",
         "rollForward": "minor",
         "allowPrerelease": false
     },

dotnet/nuget/nuget-package.props

@@ -1,14 +1,14 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.13.0</VersionPrefix>
+    <VersionPrefix>1.8.0</VersionPrefix>
     <RCNumber>1</RCNumber>
-    <DateSuffix>260703</DateSuffix>
+    <DateSuffix>260528</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.13.0</GitTag>
+    <GitTag>1.8.0</GitTag>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>

dotnet/samples/01-get-started/01_hello_agent/01_hello_agent.csproj

@@ -9,12 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>

dotnet/samples/01-get-started/01_hello_agent/Program.cs

@@ -1,19 +1,23 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-// This sample shows how to create and use a simple AI agent with AIProjectClient as the backend.
+// This sample shows how to create and use a simple AI agent with Azure OpenAI as the backend.
 
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
+using OpenAI.Chat;
 
-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+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";
 
 // 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 AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: model, instructions: "You are good at telling jokes.", name: "Joker");
+AIAgent agent = new AzureOpenAIClient(
+    new Uri(endpoint),
+    new DefaultAzureCredential())
+    .GetChatClient(deploymentName)
+    .AsAIAgent(instructions: "You are good at telling jokes.", name: "Joker");
 
 // Invoke the agent and output the text result.
 Console.WriteLine(await agent.RunAsync("Tell me a joke about a pirate."));

dotnet/samples/01-get-started/02_add_tools/02_add_tools.csproj

@@ -9,12 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>

dotnet/samples/01-get-started/02_add_tools/Program.cs

@@ -1,27 +1,31 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-// This sample demonstrates how to use an AIProjectClient agent with function tools.
-// It shows both non-streaming and streaming agent interactions using weather tools.
+// This sample demonstrates how to use a ChatClientAgent with function tools.
+// It shows both non-streaming and streaming agent interactions using menu-related tools.
 
 using System.ComponentModel;
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
+using OpenAI.Chat;
 
-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+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";
 
 [Description("Get the weather for a given location.")]
 static string GetWeather([Description("The location to get the weather for.")] string location)
     => $"The weather in {location} is cloudy with a high of 15°C.";
 
-// Create the agent and provide the function tool to the agent.
+// Create the chat client and agent, and provide the function tool to the 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 AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: model, instructions: "You are a helpful assistant", tools: [AIFunctionFactory.Create(GetWeather)]);
+AIAgent agent = new AzureOpenAIClient(
+    new Uri(endpoint),
+    new DefaultAzureCredential())
+    .GetChatClient(deploymentName)
+    .AsAIAgent(instructions: "You are a helpful assistant", tools: [AIFunctionFactory.Create(GetWeather)]);
 
 // Non-streaming agent interaction with function tools.
 Console.WriteLine(await agent.RunAsync("What is the weather like in Amsterdam?"));

dotnet/samples/01-get-started/03_multi_turn/03_multi_turn.csproj

@@ -9,12 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>

dotnet/samples/01-get-started/03_multi_turn/Program.cs

@@ -2,18 +2,22 @@
 
 // This sample shows how to create and use a simple AI agent with a multi-turn conversation.
 
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
+using OpenAI.Chat;
 
-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+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";
 
 // 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 AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: model, instructions: "You are good at telling jokes.", name: "Joker");
+AIAgent agent = new AzureOpenAIClient(
+    new Uri(endpoint),
+    new DefaultAzureCredential())
+    .GetChatClient(deploymentName)
+    .AsAIAgent(instructions: "You are good at telling jokes.", name: "Joker");
 
 // Invoke the agent with a multi-turn conversation, where the context is preserved in the session object.
 AgentSession session = await agent.CreateSessionAsync();

dotnet/samples/01-get-started/04_memory/04_memory.csproj

@@ -9,12 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -8,48 +8,35 @@
 
 using System.Text;
 using System.Text.Json;
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
+using OpenAI.Chat;
 using SampleApp;
 
-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+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";
 
 // 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());
+ChatClient chatClient = new AzureOpenAIClient(
+    new Uri(endpoint),
+    new DefaultAzureCredential())
+    .GetChatClient(deploymentName);
 
-// Create a separate IChatClient for the memory component to use for structured extraction.
-// The memory component calls the model with a ResponseFormat (JSON schema) to extract user info.
-// Using a dedicated client here avoids mixing side-channel extraction calls with the agent's
-// conversation history, and avoids the chicken-and-egg problem of needing an IChatClient
-// before the main agent is constructed.
-IChatClient extractionClient =
-    new AIProjectClient(
-        new Uri(endpoint),
-        new DefaultAzureCredential())
-    .GetProjectOpenAIClient()
-    .GetResponsesClient()
-    .AsIChatClient(model);
-
-// Create the agent with instructions and the custom memory context provider.
-// The memory component is attached to all sessions created by the agent. Here each new memory
-// component will have its own user info object, so each session will have its own memory.
+// Create the agent and provide a factory to add our custom memory component to
+// all sessions created by the agent. Here each new memory component will have its own
+// user info object, so each session will have its own memory.
 // In real world applications/services, where the user info would be persisted in a database,
 // and preferably shared between multiple sessions used by the same user, ensure that the
 // factory reads the user id from the current context and scopes the memory component
 // and its storage to that user id.
-AIAgent agent = projectClient.AsAIAgent(new ChatClientAgentOptions
+AIAgent agent = chatClient.AsAIAgent(new ChatClientAgentOptions()
 {
-    ChatOptions = new ChatOptions
-    {
-        ModelId = model,
-        Instructions = "You are a friendly assistant. Always address the user by their name.",
-    },
-    AIContextProviders = [new UserInfoMemory(extractionClient)]
+    ChatOptions = new() { Instructions = "You are a friendly assistant. Always address the user by their name." },
+    AIContextProviders = [new UserInfoMemory(chatClient.AsIChatClient())]
 });
 
 // Create a new session for the conversation.
@@ -128,17 +115,10 @@ namespace SampleApp
             // Try and extract the user name and age from the message if we don't have it already and it's a user message.
             if ((userInfo.UserName is null || userInfo.UserAge is null) && context.RequestMessages.Any(x => x.Role == ChatRole.User))
             {
-                // The Foundry Responses API requires the model name in the request body.
-                // Retrieve it from the client's metadata so callers don't need to pass it separately.
-                var modelId = this._chatClient.GetService<ChatClientMetadata>()?.DefaultModelId
-                    ?? throw new InvalidOperationException(
-                        "Could not retrieve DefaultModelId from the extraction IChatClient. " +
-                        "Ensure the client was created with a model ID (e.g., via projectClient.AsAIAgent(...)).");
                 var result = await this._chatClient.GetResponseAsync<UserInfo>(
                     context.RequestMessages,
                     new ChatOptions()
                     {
-                        ModelId = modelId,
                         Instructions = "Extract the user's name and age from the message if present. If not present return nulls."
                     },
                     cancellationToken: cancellationToken);

dotnet/samples/01-get-started/06_host_your_agent/06_host_your_agent.csproj

@@ -21,10 +21,11 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="Azure.Identity" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting.AzureFunctions\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 </Project>

dotnet/samples/01-get-started/06_host_your_agent/Program.cs

@@ -4,32 +4,36 @@
 //
 // Prerequisites:
 //   - Azure Functions Core Tools
-//   - Foundry project endpoint and credentials
+//   - Azure OpenAI resource
 //
 // Environment variables:
-//   FOUNDRY_PROJECT_ENDPOINT
-//   FOUNDRY_MODEL (defaults to "gpt-5.4-mini")
+//   AZURE_OPENAI_ENDPOINT
+//   AZURE_OPENAI_DEPLOYMENT_NAME (defaults to "gpt-5.4-mini")
 //
 // Run with: func start
 // Then call: POST http://localhost:7071/api/agents/HostedAgent/run
 
-using Azure.AI.Projects;
+using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI.Chat;
 
-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT")
-    ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+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";
 
 // Set up an AI agent following the standard Microsoft Agent Framework pattern.
 // 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 AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())
-    .AsAIAgent(model: model, instructions: "You are a helpful assistant hosted in Azure Functions.", name: "HostedAgent");
+AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
+    .GetChatClient(deploymentName)
+    .AsAIAgent(
+        instructions: "You are a helpful assistant hosted in Azure Functions.",
+        name: "HostedAgent");
 
 // Configure the function app to host the AI agent.
 // This will automatically generate HTTP API endpoints for the agent.

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

@@ -35,7 +35,7 @@ A basic AG-UI server and client that demonstrate the foundational concepts.
 A basic AG-UI server that hosts an AI agent accessible via HTTP. Demonstrates:
 
 - Creating an ASP.NET Core web application
-- Setting up an AG-UI server endpoint with `MapAGUIServer`
+- Setting up an AG-UI server endpoint with `MapAGUI`
 - Creating an AI agent from an Azure OpenAI chat client
 - Streaming responses via Server-Sent Events (SSE)
 
@@ -204,7 +204,7 @@ dotnet run
 ### Server-Side
 
 1. Client sends HTTP POST request with messages
-2. ASP.NET Core endpoint receives the request via `MapAGUIServer`
+2. ASP.NET Core endpoint receives the request via `MapAGUI`
 3. Agent processes messages using Agent Framework
 4. Responses are streamed back as Server-Sent Events (SSE)
 
@@ -214,22 +214,16 @@ dotnet run
 2. Server responds with SSE stream
 3. Client parses events into `AgentResponseUpdate` objects
 4. Updates are displayed based on content type
-5. The client sends the full message history each turn (the stateless AG-UI client does not rely on a server-assigned `ConversationId`)
+5. `ConversationId` maintains conversation context
 
 ### Protocol Features
 
 - **HTTP POST** for requests
 - **Server-Sent Events (SSE)** for streaming responses
 - **JSON** for event serialization
-- **Thread IDs** (read from the `RUN_STARTED` event's raw representation) for conversation context. `AGUIChatClient` is stateless and intentionally does not surface a `ConversationId`.
+- **Thread IDs** (as `ConversationId`) for conversation context
 - **Run IDs** (as `ResponseId`) for tracking individual executions
 
-## Security considerations
-
-`ConversationId` keeps request/response continuity. It is not proof that the caller owns that conversation. In multi-user deployments, authenticate each AG-UI request and authorize conversation access using your application's real boundary, such as the authenticated user, tenant, or workspace.
-
-If your ASP.NET Core host shares session storage across users, pair `MapAGUI` with an isolation strategy such as `UseClaimsBasedSessionIsolation(...)` so the storage key includes a principal-specific dimension instead of relying on the conversation identifier alone.
-
 ## Troubleshooting
 
 ### Connection Refused

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <PackageReference Include="AGUI.Client" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using AGUI.Abstractions;
-using AGUI.Client;
 using Microsoft.Agents.AI;
+using Microsoft.Agents.AI.AGUI;
 using Microsoft.Extensions.AI;
 
 string serverUrl = Environment.GetEnvironmentVariable("AGUI_SERVER_URL") ?? "http://localhost:8888";
@@ -15,7 +14,7 @@ using HttpClient httpClient = new()
     Timeout = TimeSpan.FromSeconds(60)
 };
 
-AGUIChatClient chatClient = new(new(httpClient, serverUrl));
+AGUIChatClient chatClient = new(httpClient, serverUrl);
 
 AIAgent agent = chatClient.AsAIAgent(
     name: "agui-client",
@@ -50,7 +49,7 @@ try
 
         // Stream the response
         bool isFirstUpdate = true;
-        string? threadId = null;
+        string? sessionId = null;
 
         await foreach (AgentResponseUpdate update in agent.RunStreamingAsync(messages, session))
         {
@@ -59,11 +58,9 @@ try
             // First update indicates run started
             if (isFirstUpdate)
             {
-                // AGUIChatClient is stateless and never surfaces a ConversationId; the thread
-                // id is carried on the AG-UI RUN_STARTED event's raw representation.
-                threadId = (chatUpdate.RawRepresentation as RunStartedEvent)?.ThreadId;
+                sessionId = chatUpdate.ConversationId;
                 Console.ForegroundColor = ConsoleColor.Yellow;
-                Console.WriteLine($"\n[Run Started - Thread: {threadId}, Run: {chatUpdate.ResponseId}]");
+                Console.WriteLine($"\n[Run Started - Session: {chatUpdate.ConversationId}, Run: {chatUpdate.ResponseId}]");
                 Console.ResetColor();
                 isFirstUpdate = false;
             }
@@ -87,7 +84,7 @@ try
         }
 
         Console.ForegroundColor = ConsoleColor.Green;
-        Console.WriteLine($"\n[Run Finished - Thread: {threadId}]");
+        Console.WriteLine($"\n[Run Finished - Session: {sessionId}]");
         Console.ResetColor();
     }
 }

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

@@ -8,12 +8,7 @@ using OpenAI.Chat;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 builder.Services.AddHttpClient().AddLogging();
-builder.Services.AddAGUIServer();
-
-// WARNING: When adding session persistence (e.g., WithInMemorySessionStore), or running in production,
-// make sure to also register a SessionIsolationKeyProvider to scope sessions by principal in multi-user
-// deployments, e.g.:
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
+builder.Services.AddAGUI();
 
 WebApplication app = builder.Build();
 
@@ -36,6 +31,6 @@ AIAgent agent = chatClient.AsAIAgent(
     instructions: "You are a helpful assistant.");
 
 // Map the AG-UI agent endpoint
-app.MapAGUIServer("/", agent);
+app.MapAGUI("/", agent);
 
 await app.RunAsync();

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

@@ -14,7 +14,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
   </ItemGroup>
 

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <PackageReference Include="AGUI.Client" />
+    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.AGUI\Microsoft.Agents.AI.AGUI.csproj" />
   </ItemGroup>
 
 </Project>