Fix CI failures.

Address PR comments.
Address PR comments
2026-06-11 10:51:06 -07:00 · 2026-06-11 10:35:34 -07:00 · 2026-06-10 17:43:42 -07:00 · 2026-06-10 15:43:36 -07:00 · 2026-06-10 14:13:52 -07:00
513 changed files with 2820 additions and 24293 deletions
@@ -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
@@ -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.
@@ -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,
-};
@@ -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}
-```
@@ -317,10 +317,9 @@ jobs:
          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
@@ -2,7 +2,7 @@ name: Issue Triage

 on:
  issues:
-    types: [opened, typed]
+    types: [opened, labeled]

 permissions:
  contents: read
@@ -12,7 +12,9 @@ permissions:
 concurrency:
  group: >-
    issue-triage-${{ github.repository }}-${{
-      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
@@ -26,7 +28,7 @@ env:
 jobs:
  team_check:
    runs-on: ubuntu-latest
-    if: ${{ 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 }}
@@ -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 });
@@ -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);
+              }
+            }
@@ -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
@@ -31,10 +31,6 @@ jobs:
          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'
@@ -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
@@ -214,7 +214,6 @@ WARP.md
 **/memory-bank/
 **/projectBrief.md
 **/tmpclaude*
-.kiro/
 # Dependency-bound validation reports
 python/scripts/dependency-*-results.json
 python/scripts/dependencies/dependency-*-results.json
@@ -1 +0,0 @@
-../../../.github/skills/pull-requests
@@ -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.",
 },
 ```
-
-
@@ -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.
@@ -21,7 +21,6 @@
    <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.25" />
    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.4" />
@@ -139,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" />
@@ -1,4 +1,4 @@
-<Solution>
+<Solution>
  <Configurations>
    <BuildType Name="Debug" />
    <BuildType Name="Publish" />
@@ -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" />
@@ -128,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" />
@@ -138,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" />
@@ -194,17 +194,15 @@
    <Project Path="samples/02-agents/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.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" />
-    <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" />
  </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" />
@@ -331,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>
@@ -619,7 +614,6 @@
    <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" />
@@ -631,7 +625,6 @@
    <Project Path="src/Microsoft.Agents.AI.Workflows.Generators/Microsoft.Agents.AI.Workflows.Generators.csproj" />
    <Project Path="src/Microsoft.Agents.AI.Workflows/Microsoft.Agents.AI.Workflows.csproj" />
    <Project Path="src/Microsoft.Agents.AI/Microsoft.Agents.AI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Valkey/Microsoft.Agents.AI.Valkey.csproj" />
  </Folder>
  <Folder Name="/Tests/" />
  <Folder Name="/Tests/IntegrationTests/">
@@ -675,7 +668,6 @@
    <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" />
@@ -686,8 +678,5 @@
    <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" />
-    <Project Path="tests/Microsoft.Agents.AI.Valkey.UnitTests/Microsoft.Agents.AI.Valkey.UnitTests.csproj" />
  </Folder>
 </Solution>
-
-
@@ -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 =
@@ -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,7 +709,7 @@ 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 =
@@ -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 =
@@ -843,7 +856,7 @@ internal static class AgentsSamples
        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,7 +1064,7 @@ internal static class AgentsSamples
        new SampleDefinition
        {
            Name = "FoundryAgent_Step15_ComputerUse",
-            ProjectPath = "samples/02-agents/AgentProviders/foundry/Agent_Step15_ComputerUse",
+            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."],
@@ -1060,7 +1073,7 @@ internal static class AgentsSamples
        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."],
@@ -13,7 +13,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.A2A\Microsoft.Agents.AI.A2A.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.A2A\Microsoft.Agents.AI.A2A.csproj" />
  </ItemGroup>

 </Project>
@@ -15,7 +15,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
  </ItemGroup>

 </Project>
@@ -1,4 +1,4 @@
-# Creating an AIAgent with Anthropic
+# Creating an AIAgent with Anthropic

 This sample demonstrates how to create an AIAgent using Anthropic Claude models as the underlying inference service.

@@ -51,4 +51,3 @@ $env:ANTHROPIC_CHAT_MODEL_NAME="claude-haiku-4-5"  # Optional, defaults to claud
 ```

 **Note**: When using Microsoft Foundry with Azure CLI, make sure you're logged in with `az login` and have access to the Microsoft Foundry resource. For more information, see the [Azure CLI documentation](https://learn.microsoft.com/cli/azure/authenticate-azure-cli-interactively).
-
@@ -9,12 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Azure.AI.Agents.Persistent" />
    <PackageReference Include="Azure.Identity" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.AzureAI.Persistent\Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+#pragma warning disable CS0618 // Type or member is obsolete - sample uses deprecated PersistentAgentsClientExtensions
+
+// This sample shows how to create and use a simple AI agent with Microsoft Foundry Agents as the backend.
+
+using Azure.AI.Agents.Persistent;
+using Azure.Identity;
+using Microsoft.Agents.AI;
+
+var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+
+const string JokerName = "Joker";
+const string JokerInstructions = "You are good at telling jokes.";
+
+// Get a client to create/retrieve server side agents with.
+// 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 persistentAgentsClient = new PersistentAgentsClient(endpoint, new DefaultAzureCredential());
+
+// You can create a server side persistent agent with the Azure.AI.Agents.Persistent SDK.
+var agentMetadata = await persistentAgentsClient.Administration.CreateAgentAsync(
+    model: deploymentName,
+    name: JokerName,
+    instructions: JokerInstructions);
+
+// You can retrieve an already created server side persistent agent as an AIAgent.
+AIAgent agent1 = await persistentAgentsClient.GetAIAgentAsync(agentMetadata.Value.Id);
+
+// You can also create a server side persistent agent and return it as an AIAgent directly.
+AIAgent agent2 = await persistentAgentsClient.CreateAIAgentAsync(
+    model: deploymentName,
+    name: JokerName,
+    instructions: JokerInstructions);
+
+// You can then invoke the agent like any other AIAgent.
+AgentSession session = await agent1.CreateSessionAsync();
+Console.WriteLine(await agent1.RunAsync("Tell me a joke about a pirate.", session));
+
+// Cleanup for sample purposes.
+await persistentAgentsClient.Administration.DeleteAgentAsync(agent1.Id);
+await persistentAgentsClient.Administration.DeleteAgentAsync(agent2.Id);
@@ -0,0 +1,26 @@
+# Classic Foundry Agents 
+
+This sample demonstrates how to create an agent using the classic Foundry Agents experience.
+
+# Classic vs New Foundry Agents
+
+Below is a comparison between the classic and new Foundry Agents approaches:
+
+[Migration Guide](https://learn.microsoft.com/en-us/azure/ai-foundry/agents/how-to/migrate?view=foundry)
+
+# Prerequisites
+
+Before you begin, ensure you have the following prerequisites:
+
+- .NET 10 SDK or later
+- Microsoft Foundry service endpoint and deployment configured
+- Azure CLI installed and authenticated (for Azure credential authentication)
+
+**Note**: This demo uses Azure CLI credentials for authentication. Make sure you're logged in with `az login` and have access to the Microsoft Foundry resource. For more information, see the [Azure CLI documentation](https://learn.microsoft.com/cli/azure/authenticate-azure-cli-interactively).
+
+Set the following environment variables:
+
+```powershell
+$env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project" # Replace with your Microsoft Foundry resource endpoint
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+```
@@ -15,7 +15,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
  </ItemGroup>

 </Project>
@@ -8,8 +8,8 @@ using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;

-var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";

 const string JokerName = "JokerAgent";

@@ -1,4 +1,4 @@
-# New Foundry Agents 
+# New Foundry Agents 

 This sample demonstrates how to create an agent using the new Foundry Agents experience. 

@@ -21,6 +21,6 @@ Before you begin, ensure you have the following prerequisites:
 Set the following environment variables:

 ```powershell
-$env:FOUNDRY_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project" # Replace with your Microsoft Foundry resource endpoint
-$env:FOUNDRY_MODEL="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
+$env:AZURE_AI_PROJECT_ENDPOINT="https://your-foundry-service.services.ai.azure.com/api/projects/your-foundry-project" # Replace with your Microsoft Foundry resource endpoint
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"  # Optional, defaults to gpt-5.4-mini
 ```
@@ -13,7 +13,7 @@
  </ItemGroup>

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

 </Project>
@@ -13,7 +13,7 @@ using OpenAI.Chat;

 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
 var apiKey = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY");
-var model = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "Phi-4-mini-instruct";
+var model = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "Phi-4-mini-instruct";

 // Since we are using the OpenAI Client SDK, we need to override the default endpoint to point to Microsoft Foundry.
 var clientOptions = new OpenAIClientOptions() { Endpoint = new Uri(endpoint) };
@@ -1,4 +1,4 @@
-## Overview
+## Overview

 This sample shows how to use the OpenAI SDK to create and use a simple AI agent with any model hosted in Microsoft Foundry.

@@ -13,7 +13,7 @@ Before you begin, ensure you have the following prerequisites:
 - .NET 10 SDK or later
 - Microsoft Foundry resource
 - A model deployment in your Microsoft Foundry resource. This example defaults to using the `Phi-4-mini-instruct` model,
-so if you want to use a different model, ensure that you set your `FOUNDRY_MODEL` environment
+so if you want to use a different model, ensure that you set your `AZURE_AI_MODEL_DEPLOYMENT_NAME` environment
 variable to the name of your deployed model.
 - An API key or role based authentication to access the Microsoft Foundry resource

@@ -30,5 +30,5 @@ $env:AZURE_OPENAI_ENDPOINT="https://ai-foundry-<myresourcename>.services.ai.azur
 $env:AZURE_OPENAI_API_KEY="************"

 # Optional, defaults to Phi-4-mini-instruct
-$env:FOUNDRY_MODEL="Phi-4-mini-instruct"
+$env:AZURE_AI_MODEL_DEPLOYMENT_NAME="Phi-4-mini-instruct"
 ```
@@ -14,7 +14,7 @@
  </ItemGroup>

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

 </Project>
@@ -14,7 +14,7 @@
  </ItemGroup>

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

 </Project>
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Abstractions\Microsoft.Agents.AI.Abstractions.csproj" />
  </ItemGroup>

 </Project>
@@ -14,7 +14,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.GitHub.Copilot\Microsoft.Agents.AI.GitHub.Copilot.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.GitHub.Copilot\Microsoft.Agents.AI.GitHub.Copilot.csproj" />
  </ItemGroup>

 </Project>
@@ -19,7 +19,7 @@
  </ItemGroup>
  
  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -13,7 +13,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -13,7 +13,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
  </ItemGroup>

 </Project>
@@ -9,7 +9,7 @@
  </PropertyGroup>

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

 </Project>
@@ -9,7 +9,7 @@
  </PropertyGroup>

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

 </Project>
@@ -1,8 +1,7 @@
-# Creating an AIAgent with various providers
+# Creating an AIAgent instance for various providers

-These samples show how to create an AIAgent instance using various providers,
-organized by provider. This is not an exhaustive list, but shows a variety of
-the more popular options.
+These samples show how to create an AIAgent instance using various providers.
+This is not an exhaustive list, but shows a variety of the more popular options.

 For other samples that demonstrate how to use AIAgent instances,
 see the [Getting Started With Agents](../Agents/README.md) samples.
@@ -11,88 +10,54 @@ see the [Getting Started With Agents](../Agents/README.md) samples.

 See the README.md for each sample for the prerequisites for that sample.

-## Providers
+## Samples

-### [A2A](./a2a/)
+|Sample|Description|
+|---|---|
+|[Creating an AIAgent with A2A](./Agent_With_A2A/)|This sample demonstrates how to create AIAgent for an existing A2A agent.|
+|[Creating an AIAgent with Anthropic](./Agent_With_Anthropic/)|This sample demonstrates how to create an AIAgent using Anthropic Claude models as the underlying inference service|
+|[Creating an AIAgent with Foundry Agents using Azure.AI.Agents.Persistent](./Agent_With_AzureAIAgentsPersistent/)|This sample demonstrates how to create a Foundry Persistent agent and expose it as an AIAgent using the Azure.AI.Agents.Persistent SDK|
+|[Creating an AIAgent with Foundry Agents using Azure.AI.Project](./Agent_With_AzureAIProject/)|This sample demonstrates how to create an Foundry Project agent and expose it as an AIAgent using the Azure.AI.Project SDK|
+|[Creating an AIAgent with Foundry Model](./Agent_With_AzureFoundryModel/)|This sample demonstrates how to use any model deployed to Microsoft Foundry to create an AIAgent|
+|[Creating an AIAgent with Azure OpenAI ChatCompletion](./Agent_With_AzureOpenAIChatCompletion/)|This sample demonstrates how to create an AIAgent using Azure OpenAI ChatCompletion as the underlying inference service|
+|[Creating an AIAgent with Azure OpenAI Responses](./Agent_With_AzureOpenAIResponses/)|This sample demonstrates how to create an AIAgent using Azure OpenAI Responses as the underlying inference service|
+|[Creating an AIAgent with a custom implementation](./Agent_With_CustomImplementation/)|This sample demonstrates how to create an AIAgent with a custom implementation|
+|[Creating an AIAgent with GitHub Copilot](./Agent_With_GitHubCopilot/)|This sample demonstrates how to create an AIAgent using GitHub Copilot SDK as the underlying inference service|
+|[Creating an AIAgent with Ollama](./Agent_With_Ollama/)|This sample demonstrates how to create an AIAgent using Ollama as the underlying inference service|
+|[Creating an AIAgent with ONNX](./Agent_With_ONNX/)|This sample demonstrates how to create an AIAgent using ONNX as the underlying inference service|
+|[Creating an AIAgent with OpenAI ChatCompletion](./Agent_With_OpenAIChatCompletion/)|This sample demonstrates how to create an AIAgent using OpenAI ChatCompletion as the underlying inference service|
+|[Creating an AIAgent with OpenAI Responses](./Agent_With_OpenAIResponses/)|This sample demonstrates how to create an AIAgent using OpenAI Responses as the underlying inference service|

-| Sample | Description |
-| --- | --- |
-| [Agent with A2A](./a2a/Agent_With_A2A/) | Create an AIAgent for an existing A2A agent |
+## Running the samples from the console

-### [Anthropic](./anthropic/)
+To run the samples, navigate to the desired sample directory, e.g.

-| Sample | Description |
-| --- | --- |
-| [Agent with Anthropic](./anthropic/Agent_With_Anthropic/) | Create an AIAgent using Anthropic Claude models |
-| [Running](./anthropic/Agent_Anthropic_Step01_Running/) | Basic Anthropic agent usage |
-| [Reasoning](./anthropic/Agent_Anthropic_Step02_Reasoning/) | Using Anthropic reasoning capabilities |
-| [Function Tools](./anthropic/Agent_Anthropic_Step03_UsingFunctionTools/) | Using function tools with Anthropic |
-| [Skills](./anthropic/Agent_Anthropic_Step04_UsingSkills/) | Using skills with Anthropic agents |
+```powershell
+cd AIAgent_With_AzureOpenAIChatCompletion
+```

-### [Azure](./azure/)
+Set the required environment variables as documented in the sample readme.
+If the variables are not set, you will be prompted for the values when running the samples.
+Execute the following command to build the sample:

-| Sample | Description |
-| --- | --- |
-| [Azure AI Project](./azure/Agent_With_AzureAIProject/) | Create a Foundry Project agent using the Azure.AI.Project SDK |
-| [Azure Foundry Model](./azure/Agent_With_AzureFoundryModel/) | Use any model deployed to Microsoft Foundry |
-| [Azure OpenAI ChatCompletion](./azure/Agent_With_AzureOpenAIChatCompletion/) | Create an AIAgent using Azure OpenAI ChatCompletion |
-| [Azure OpenAI Responses](./azure/Agent_With_AzureOpenAIResponses/) | Create an AIAgent using Azure OpenAI Responses |
+```powershell
+dotnet build
+```

-### [Custom](./custom/)
+Execute the following command to run the sample:

-| Sample | Description |
-| --- | --- |
-| [Custom Implementation](./custom/Agent_With_CustomImplementation/) | Create an AIAgent with a custom implementation |
+```powershell
+dotnet run --no-build
+```

-### [Foundry](./foundry/)
-
-See [foundry/README.md](./foundry/README.md) for the full list of Foundry agent samples,
-covering basics, function tools, structured output, middleware, MCP, code interpreter, and more.
-
-### [GitHub Copilot](./github-copilot/)
-
-| Sample | Description |
-| --- | --- |
-| [GitHub Copilot](./github-copilot/Agent_With_GitHubCopilot/) | Create an AIAgent using GitHub Copilot SDK |
-
-### [Google Gemini](./google-gemini/)
-
-| Sample | Description |
-| --- | --- |
-| [Google Gemini](./google-gemini/Agent_With_GoogleGemini/) | Create an AIAgent using Google Gemini |
-
-### [Ollama](./ollama/)
-
-| Sample | Description |
-| --- | --- |
-| [Ollama](./ollama/Agent_With_Ollama/) | Create an AIAgent using Ollama |
-
-### [ONNX](./onnx/)
-
-| Sample | Description |
-| --- | --- |
-| [ONNX](./onnx/Agent_With_ONNX/) | Create an AIAgent using ONNX Runtime |
-
-### [OpenAI](./openai/)
-
-| Sample | Description |
-| --- | --- |
-| [OpenAI ChatCompletion](./openai/Agent_With_OpenAIChatCompletion/) | Create an AIAgent using OpenAI ChatCompletion |
-| [OpenAI Responses](./openai/Agent_With_OpenAIResponses/) | Create an AIAgent using OpenAI Responses |
-| [Running](./openai/Agent_OpenAI_Step01_Running/) | Basic OpenAI agent usage |
-| [Reasoning](./openai/Agent_OpenAI_Step02_Reasoning/) | Using OpenAI reasoning capabilities |
-| [Create from ChatClient](./openai/Agent_OpenAI_Step03_CreateFromChatClient/) | Create agent from IChatClient |
-| [Create from Response Client](./openai/Agent_OpenAI_Step04_CreateFromOpenAIResponseClient/) | Create agent from OpenAI Response client |
-| [Conversation](./openai/Agent_OpenAI_Step05_Conversation/) | Multi-turn conversations with OpenAI |
-| [Code Interpreter](./openai/Agent_OpenAI_Step06_CodeInterpreterFileDownload/) | Code interpreter with file downloads |
-
-## Running the samples
-
-Navigate to a sample directory and run:
+Or just build and run in one step:

 ```powershell
 dotnet run
 ```

-Set the required environment variables as documented in each sample's README.
-If the variables are not set, you will be prompted for the values when running the samples.
+## Running the samples from Visual Studio
+
+Open the solution in Visual Studio and set the desired sample project as the startup project. Then, run the project using the built-in debugger or by pressing `F5`.
+
+You will be prompted for any required environment variables if they are not already set.
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Abstractions\Microsoft.Agents.AI.Abstractions.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.Identity" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -26,9 +26,6 @@ var skillsProvider = new AgentSkillsProvider(
    SubprocessScriptRunner.RunAsync);

 // --- Agent Setup ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
    .AsAIAgent(new ChatClientAgentOptions
@@ -67,9 +67,6 @@ var unitConverterSkill = new AgentInlineSkill(
 var skillsProvider = new AgentSkillsProvider(unitConverterSkill);

 // --- Agent Setup ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
    .AsAIAgent(new ChatClientAgentOptions
@@ -22,9 +22,6 @@ var unitConverter = new UnitConverterSkill();
 var skillsProvider = new AgentSkillsProvider(unitConverter);

 // --- Agent Setup ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
    .AsAIAgent(new ChatClientAgentOptions
@@ -64,9 +64,6 @@ var skillsProvider = new AgentSkillsProviderBuilder()
    .Build();

 // --- Agent Setup ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
    .AsAIAgent(new ChatClientAgentOptions
@@ -80,9 +80,6 @@ var weightSkill = new WeightConverterSkill();
 var skillsProvider = new AgentSkillsProvider(distanceSkill, weightSkill);

 // --- Agent Setup ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
    .GetResponsesClient()
    .AsAIAgent(
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
  </ItemGroup>

 </Project>
@@ -1,4 +1,4 @@
-# Running a simple agent with Anthropic
+# Running a simple agent with Anthropic

 This sample demonstrates how to create and run a basic agent with Anthropic Claude models.

@@ -26,10 +26,10 @@ $env:ANTHROPIC_CHAT_MODEL_NAME="your-anthropic-model"  # Replace with your Anthr

 ## Run the sample

-Navigate to the Anthropic sample directory and run:
+Navigate to the AgentWithAnthropic sample directory and run:

 ```powershell
-cd dotnet\samples\02-agents\AgentProviders\anthropic
+cd dotnet\samples\02-agents\AgentWithAnthropic
 dotnet run --project .\Agent_Anthropic_Step01_Running
 ```

@@ -41,4 +41,3 @@ The sample will:
 2. Run the agent with a simple prompt
 3. Display the agent's response

-
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
  </ItemGroup>

 </Project>
@@ -1,4 +1,4 @@
-# Using reasoning with Anthropic agents
+# Using reasoning with Anthropic agents

 This sample demonstrates how to use extended thinking/reasoning capabilities with Anthropic Claude agents.

@@ -28,10 +28,10 @@ $env:ANTHROPIC_CHAT_MODEL_NAME="your-anthropic-model"  # Replace with your Anthr

 ## Run the sample

-Navigate to the Anthropic sample directory and run:
+Navigate to the AgentWithAnthropic sample directory and run:

 ```powershell
-cd dotnet\samples\02-agents\AgentProviders\anthropic
+cd dotnet\samples\02-agents\AgentWithAnthropic
 dotnet run --project .\Agent_Anthropic_Step02_Reasoning
 ```

@@ -44,4 +44,3 @@ The sample will:
 3. Display the agent's thinking process
 4. Display the agent's final response

-
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
  </ItemGroup>

 </Project>
@@ -1,4 +1,4 @@
-# Using Function Tools with Anthropic agents
+# Using Function Tools with Anthropic agents

 This sample demonstrates how to use function tools with Anthropic Claude agents, allowing agents to call custom functions to retrieve information.

@@ -28,10 +28,10 @@ $env:ANTHROPIC_CHAT_MODEL_NAME="your-anthropic-model"  # Replace with your Anthr

 ## Run the sample

-Navigate to the Anthropic sample directory and run:
+Navigate to the AgentWithAnthropic sample directory and run:

 ```powershell
-cd dotnet\samples\02-agents\AgentProviders\anthropic
+cd dotnet\samples\02-agents\AgentWithAnthropic
 dotnet run --project .\Agent_Anthropic_Step03_UsingFunctionTools
 ```

@@ -45,4 +45,3 @@ The sample will:
 4. Run the agent again with streaming to display the response as it's generated
 5. Clean up resources by deleting the agent

-
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Anthropic\Microsoft.Agents.AI.Anthropic.csproj" />
  </ItemGroup>

 </Project>
@@ -1,4 +1,4 @@
-# Using Anthropic Skills with agents
+# Using Anthropic Skills with agents

 This sample demonstrates how to use Anthropic-managed Skills with AI agents. Skills are pre-built capabilities provided by Anthropic that can be used with the Claude API.

@@ -29,10 +29,10 @@ $env:ANTHROPIC_CHAT_MODEL_NAME="your-anthropic-model"  # Replace with your Anthr

 ## Run the sample

-Navigate to the Anthropic sample directory and run:
+Navigate to the AgentWithAnthropic sample directory and run:

 ```powershell
-cd dotnet\samples\02-agents\AgentProviders\anthropic
+cd dotnet\samples\02-agents\AgentWithAnthropic
 dotnet run --project .\Agent_Anthropic_Step04_UsingSkills
 ```

@@ -117,4 +117,3 @@ foreach (HostedFileContent file in hostedFiles)
    await contentStream.CopyToAsync(fileStream);
 }
 ```
-
@@ -1,4 +1,4 @@
-# Getting started with agents using Anthropic
+# Getting started with agents using Anthropic

 The getting started with agents using Anthropic samples demonstrate the fundamental concepts and functionalities
 of single agents using Anthropic as the AI provider.
@@ -6,7 +6,7 @@ of single agents using Anthropic as the AI provider.
 These samples use Anthropic Claude models as the AI provider and use ChatCompletion as the type of service.

 For other samples that demonstrate how to create and configure each type of agent that come with the agent framework,
-see the [How to create an agent for each provider](../README.md) samples.
+see the [How to create an agent for each provider](../AgentProviders/README.md) samples.

 ## Getting started with agents using Anthropic prerequisites

@@ -20,7 +20,7 @@ Before you begin, ensure you have the following prerequisites:

 ## Using Anthropic with Microsoft Foundry

-To use Anthropic with Microsoft Foundry, you can check the sample [providers/Agent_With_Anthropic](./Agent_With_Anthropic/README.md) for more details.
+To use Anthropic with Microsoft Foundry, you can check the sample [AgentProviders/Agent_With_Anthropic](../AgentProviders/Agent_With_Anthropic/README.md) for more details.

 ## Samples

@@ -16,9 +16,6 @@ var guestPath = Environment.GetEnvironmentVariable("HYPERLIGHT_PYTHON_GUEST_PATH

 using var codeAct = new HyperlightCodeActProvider(HyperlightCodeActProviderOptions.CreateForWasm(guestPath));

-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(
    new Uri(endpoint),
    new DefaultAzureCredential())
@@ -39,9 +39,6 @@ options.Tools = [fetchDocs, queryData, sendEmail];

 using var codeAct = new HyperlightCodeActProvider(options);

-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(
    new Uri(endpoint),
    new DefaultAzureCredential())
@@ -31,9 +31,6 @@ var instructions =
    + "and calling `execute_code` instead of computing values yourself.\n\n"
    + executeCode.BuildInstructions(toolsVisibleToModel: false);

-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
 AIAgent agent = new AzureOpenAIClient(
    new Uri(endpoint),
    new DefaultAzureCredential())
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates using Valkey for persistent chat history with the Agent Framework.
-// ValkeyChatHistoryProvider persists conversation history across sessions using Valkey lists.
-//
-// Prerequisites:
-//   - A running Valkey server (any version):
-//       docker run -d --name valkey -p 6379:6379 valkey/valkey:latest
-//   - Azure OpenAI endpoint and deployment configured via environment variables
-
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Valkey;
-using Microsoft.Extensions.AI;
-using OpenAI.Chat;
-using Valkey.Glide;
-
-var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-var valkeyConnection = Environment.GetEnvironmentVariable("VALKEY_CONNECTION") ?? "localhost:6379";
-
-var connection = await ConnectionMultiplexer.ConnectAsync(valkeyConnection);
-
-Console.WriteLine("=== ValkeyChatHistoryProvider — Persistent Chat History ===\n");
-
-var historyProvider = new ValkeyChatHistoryProvider(
-    connection,
-    _ => new ValkeyChatHistoryProvider.State($"sample-{Guid.NewGuid():N}"),
-    new ValkeyChatHistoryProviderOptions
-    {
-        KeyPrefix = "sample_chat",
-        MaxMessages = 20
-    });
-
-AIAgent historyAgent = new AzureOpenAIClient(new Uri(endpoint), new DefaultAzureCredential())
-    .GetChatClient(deploymentName)
-    .AsAIAgent(new ChatClientAgentOptions()
-    {
-        ChatOptions = new() { Instructions = "You are a helpful assistant that remembers our conversation." },
-        ChatHistoryProvider = historyProvider
-    });
-
-AgentSession session1 = await historyAgent.CreateSessionAsync();
-Console.WriteLine(await historyAgent.RunAsync("Hello! My name is Alex and I'm a software engineer.", session1));
-Console.WriteLine(await historyAgent.RunAsync("I'm working on a project using Valkey for caching.", session1));
-Console.WriteLine(await historyAgent.RunAsync("What do you remember about me?", session1));
-
-var messageCount = await historyProvider.GetMessageCountAsync(session1);
-Console.WriteLine($"\n  Stored {messageCount} messages in Valkey.\n");
-
-// Clean up
-connection.Dispose();
-
-Console.WriteLine("Done!");
@@ -1,30 +0,0 @@
-# Agent with Memory Using Valkey
-
-This sample demonstrates using Valkey for persistent chat history with the Agent Framework.
-
-## Components
-
- **ValkeyChatHistoryProvider** — Persists conversation history across sessions using Valkey lists. Works with any Valkey or Redis OSS server (no search module required).
-
-## Prerequisites
-
- Azure OpenAI endpoint and deployment
- A running Valkey server (any version):
-
-```bash
-docker run -d --name valkey -p 6379:6379 valkey/valkey:latest
-```
-
-## Environment Variables
-
-| Variable | Description | Default |
-|---|---|---|
-| `AZURE_OPENAI_ENDPOINT` | Azure OpenAI endpoint URL | (required) |
-| `AZURE_OPENAI_DEPLOYMENT_NAME` | Model deployment name | `gpt-5.4-mini` |
-| `VALKEY_CONNECTION` | Valkey connection string | `localhost:6379` |
-
-## Running
-
-```bash
-dotnet run
-```
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates using Valkey for persistent chat history with the Agent Framework,
-// powered by Amazon Bedrock.
-//
-// Prerequisites:
-//   - A running Valkey server (any version):
-//       docker run -d --name valkey -p 6379:6379 valkey/valkey:latest
-//   - AWS credentials configured (environment variables, AWS profile, or IAM role)
-//   - Access to an Amazon Bedrock model (e.g., Anthropic Claude)
-
-using Amazon;
-using Amazon.BedrockRuntime;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Valkey;
-using Microsoft.Extensions.AI;
-using Valkey.Glide;
-
-var awsRegion = Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1";
-var modelId = Environment.GetEnvironmentVariable("BEDROCK_MODEL_ID") ?? "anthropic.claude-3-5-sonnet-20241022-v2:0";
-var valkeyConnection = Environment.GetEnvironmentVariable("VALKEY_CONNECTION") ?? "localhost:6379";
-
-// Create the Bedrock runtime client.
-var bedrockRuntime = new AmazonBedrockRuntimeClient(RegionEndpoint.GetBySystemName(awsRegion));
-IChatClient chatClient = bedrockRuntime.AsIChatClient(modelId);
-
-var connection = await ConnectionMultiplexer.ConnectAsync(valkeyConnection);
-
-Console.WriteLine("=== ValkeyChatHistoryProvider — Persistent Chat History (Bedrock) ===\n");
-
-var historyProvider = new ValkeyChatHistoryProvider(
-    connection,
-    _ => new ValkeyChatHistoryProvider.State($"bedrock-sample-{Guid.NewGuid():N}"),
-    new ValkeyChatHistoryProviderOptions
-    {
-        KeyPrefix = "bedrock_chat",
-        MaxMessages = 20
-    });
-
-AIAgent historyAgent = chatClient.AsAIAgent(new ChatClientAgentOptions()
-{
-    ChatOptions = new() { Instructions = "You are a helpful assistant that remembers our conversation." },
-    ChatHistoryProvider = historyProvider
-});
-
-AgentSession session1 = await historyAgent.CreateSessionAsync();
-Console.WriteLine(await historyAgent.RunAsync("Hello! My name is Alex and I'm a software engineer.", session1));
-Console.WriteLine(await historyAgent.RunAsync("I'm working on a project using Valkey for caching.", session1));
-Console.WriteLine(await historyAgent.RunAsync("What do you remember about me?", session1));
-
-var messageCount = await historyProvider.GetMessageCountAsync(session1);
-Console.WriteLine($"\n  Stored {messageCount} messages in Valkey.\n");
-
-// Clean up
-connection.Dispose();
-
-Console.WriteLine("Done!");
@@ -1,41 +0,0 @@
-# Agent with Memory Using Valkey + Amazon Bedrock
-
-This sample demonstrates using Valkey for persistent chat history with the Agent Framework, powered by Amazon Bedrock via the `AWSSDK.Extensions.Bedrock.MEAI` adapter.
-
-## Components
-
- **ValkeyChatHistoryProvider** — Persists conversation history across sessions using Valkey lists. Works with any Valkey or Redis OSS server (no search module required).
- **Amazon Bedrock** — Provides the LLM via `AWSSDK.Extensions.Bedrock.MEAI`, which implements `IChatClient` from `Microsoft.Extensions.AI`.
-
-## Prerequisites
-
- AWS credentials configured (environment variables, AWS CLI profile, or IAM role)
- Access to an Amazon Bedrock model (e.g., Anthropic Claude 3.5 Sonnet)
- A running Valkey server (any version):
-
-```bash
-docker run -d --name valkey -p 6379:6379 valkey/valkey:latest
-```
-
-## Environment Variables
-
-| Variable | Description | Default |
-|---|---|---|
-| `AWS_REGION` | AWS region for Bedrock | `us-east-1` |
-| `BEDROCK_MODEL_ID` | Bedrock model identifier | `anthropic.claude-3-5-sonnet-20241022-v2:0` |
-| `VALKEY_CONNECTION` | Valkey connection string | `localhost:6379` |
-| `AWS_ACCESS_KEY_ID` | AWS access key (if not using profile/role) | — |
-| `AWS_SECRET_ACCESS_KEY` | AWS secret key (if not using profile/role) | — |
-
-## Running
-
-```bash
-# Using default AWS credential chain (profile, env vars, or IAM role)
-dotnet run
-
-# Or with explicit credentials
-export AWS_ACCESS_KEY_ID="your-access-key"
-export AWS_SECRET_ACCESS_KEY="your-secret-key"
-export AWS_REGION="us-east-1"
-dotnet run
-```
@@ -13,9 +13,9 @@ using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;

-string foundryEndpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
+string foundryEndpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
 string memoryStoreName = Environment.GetEnvironmentVariable("AZURE_AI_MEMORY_STORE_ID") ?? "memory-store-sample";
-string deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
+string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
 string embeddingModelName = Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDING_DEPLOYMENT_NAME") ?? "text-embedding-ada-002";

 // Create an AIProjectClient for Foundry with Azure Identity authentication.
@@ -1,4 +1,4 @@
-# Agent with Memory Using Microsoft Foundry
+# Agent with Memory Using Microsoft Foundry

 This sample demonstrates how to create and run an agent that uses Microsoft Foundry's managed memory service to extract and retrieve individual memories across sessions.

@@ -22,11 +22,11 @@ This sample demonstrates how to create and run an agent that uses Microsoft Foun

 ```bash
 # Microsoft Foundry project endpoint and memory store name
-export FOUNDRY_PROJECT_ENDPOINT="https://your-account.services.ai.azure.com/api/projects/your-project"
+export AZURE_AI_PROJECT_ENDPOINT="https://your-account.services.ai.azure.com/api/projects/your-project"
 export AZURE_AI_MEMORY_STORE_ID="my_memory_store"

 # Model deployment names (models deployed in your Foundry project)
-export FOUNDRY_MODEL="gpt-5.4-mini"
+export AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4-mini"
 export AZURE_AI_EMBEDDING_DEPLOYMENT_NAME="text-embedding-ada-002"
 ```

@@ -10,5 +10,4 @@ These samples show how to create an agent with the Agent Framework that uses Mem
 |[Memory with Microsoft Foundry](./AgentWithMemory_Step04_MemoryUsingFoundry/)|This sample demonstrates how to create and run an agent that uses Microsoft Foundry's managed memory service to extract and retrieve individual memories.|
 |[Bounded Chat History with Overflow](./AgentWithMemory_Step05_BoundedChatHistory/)|This sample demonstrates how to create a bounded chat history provider that overflows older messages to a vector store and recalls them as memories.|

-> **See also**: [Memory Search with Foundry Agents](../AgentProviders/foundry/Agent_Step22_MemorySearch/) - demonstrates using the built-in Memory Search tool with Microsoft Foundry agents.
-
+> **See also**: [Memory Search with Foundry Agents](../AgentsWithFoundry/Agent_Step22_MemorySearch/) - demonstrates using the built-in Memory Search tool with Microsoft Foundry agents.
@@ -9,7 +9,7 @@
  </PropertyGroup>

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

 </Project>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Ibekwe	d83bc07582	Fix CI failures.	2026-06-11 10:51:06 -07:00
Peter Ibekwe	4b0aeb76a5	Address PR comments.	2026-06-11 10:35:34 -07:00
Peter Ibekwe	c0ea099bd8	Address PR comments	2026-06-10 17:43:42 -07:00
Peter Ibekwe	3498f9dc66	Remove unnecessary comment	2026-06-10 15:43:36 -07:00
Peter Ibekwe	564259a4aa	Fix declarative object parsing bug	2026-06-10 14:13:52 -07:00