Revert unnecessary bool simplification in WorkflowAgent input selection

.github/scripts/pr_limit_moderation.js

@@ -1,163 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-function getPullRequest(context) {
-  const pullRequest = context.payload.pull_request;
-  if (!pullRequest?.number || !pullRequest.user?.login) {
-    throw new Error('This script must be run from a pull_request_target event.');
-  }
-
-  return {
-    author: pullRequest.user.login,
-    labels: pullRequest.labels?.map((label) => label.name).filter(Boolean) ?? [],
-    number: pullRequest.number,
-  };
-}
-
-async function ensureLabel({ github, owner, repo, labelName }) {
-  try {
-    await github.rest.issues.getLabel({
-      owner,
-      repo,
-      name: labelName,
-    });
-  } catch (error) {
-    if (error.status !== 404) {
-      throw error;
-    }
-
-    try {
-      await github.rest.issues.createLabel({
-        owner,
-        repo,
-        name: labelName,
-        color: 'd93f0b',
-        description: 'Community author has exceeded the open pull request limit.',
-      });
-    } catch (createError) {
-      if (createError.status !== 422) {
-        throw createError;
-      }
-    }
-  }
-}
-
-function hasLabel(labels, labelName) {
-  if (!labelName) {
-    return false;
-  }
-
-  return labels.some((label) => label.toLowerCase() === labelName.toLowerCase());
-}
-
-function buildLimitMessage({ author, exemptLabelName, maxOpenPrs, openPrCount }) {
-  return [
-    `Thank you for your contribution, @${author}.`,
-    '',
-    `To keep the review queue manageable, we currently limit community contributors to ${maxOpenPrs} `
-      + `open pull requests at a time. This PR would put you at ${openPrCount} open pull requests, `
-      + 'so we are closing it automatically.',
-    '',
-    'Please focus on getting your existing PRs reviewed, merged, or closed before opening another one. '
-      + `If a maintainer asked you to open this PR, they can apply the \`${exemptLabelName}\` label and reopen it.`,
-  ].join('\n');
-}
-
-async function getOpenPrCount({ github, owner, repo, author, pullRequestNumber }) {
-  const query = `repo:${owner}/${repo} is:pr is:open author:${author}`;
-  const response = await github.rest.search.issuesAndPullRequests({
-    q: query,
-    per_page: 100,
-  });
-
-  const indexedPrNumbers = response.data.items.map((item) => item.number);
-  const currentPrIsIndexed = indexedPrNumbers.includes(pullRequestNumber);
-  if (currentPrIsIndexed || response.data.total_count >= 100) {
-    return response.data.total_count;
-  }
-
-  return response.data.total_count + 1;
-}
-
-async function enforcePrLimit({ github, context, core, exemptLabelName, maxOpenPrs, labelName }) {
-  const { owner, repo } = context.repo;
-  const { author, labels, number } = getPullRequest(context);
-
-  if (hasLabel(labels, exemptLabelName)) {
-    core.info(`PR #${number} has the ${exemptLabelName} label; skipping open PR limit enforcement.`);
-    return {
-      author,
-      closed: false,
-      exempt: true,
-      openPrCount: null,
-    };
-  }
-
-  const openPrCount = await getOpenPrCount({
-    github,
-    owner,
-    repo,
-    author,
-    pullRequestNumber: number,
-  });
-
-  if (openPrCount <= maxOpenPrs) {
-    core.info(
-      `${author} has ${openPrCount} open pull request(s), which is within the limit of ${maxOpenPrs}.`,
-    );
-    return {
-      author,
-      closed: false,
-      openPrCount,
-    };
-  }
-
-  await ensureLabel({
-    github,
-    owner,
-    repo,
-    labelName,
-  });
-
-  await github.rest.issues.addLabels({
-    owner,
-    repo,
-    issue_number: number,
-    labels: [labelName],
-  });
-
-  await github.rest.issues.createComment({
-    owner,
-    repo,
-    issue_number: number,
-    body: buildLimitMessage({
-      author,
-      exemptLabelName,
-      maxOpenPrs,
-      openPrCount,
-    }),
-  });
-
-  await github.rest.pulls.update({
-    owner,
-    repo,
-    pull_number: number,
-    state: 'closed',
-  });
-
-  core.info(
-    `${author} has ${openPrCount} open pull request(s), which exceeds the limit of ${maxOpenPrs}. `
-      + `Closed PR #${number}.`,
-  );
-
-  return {
-    author,
-    closed: true,
-    openPrCount,
-  };
-}
-
-module.exports = {
-  buildLimitMessage,
-  enforcePrLimit,
-  getOpenPrCount,
-};

.github/tests/test_pr_limit_moderation.js

@@ -1,286 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-/**
- * Tests for pr_limit_moderation.js.
- *
- * Run with: node --test .github/tests/test_pr_limit_moderation.js
- */
-
-const { describe, it } = require('node:test');
-const assert = require('node:assert/strict');
-
-const { enforcePrLimit } = require('../scripts/pr_limit_moderation.js');
-
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function createContext({ author = 'community-user', labels = [], number = 123 } = {}) {
-  return {
-    repo: {
-      owner: 'microsoft',
-      repo: 'agent-framework',
-    },
-    payload: {
-      pull_request: {
-        number,
-        labels: labels.map((name) => ({ name })),
-        user: {
-          login: author,
-        },
-      },
-    },
-  };
-}
-
-function createCore() {
-  const messages = [];
-  return {
-    messages,
-    info(message) {
-      messages.push(message);
-    },
-  };
-}
-
-function createGithub({ totalCount, itemNumbers, labelExists = true }) {
-  const calls = [];
-
-  return {
-    calls,
-    rest: {
-      search: {
-        async issuesAndPullRequests(params) {
-          calls.push({ api: 'search.issuesAndPullRequests', params });
-          return {
-            data: {
-              total_count: totalCount,
-              items: itemNumbers.map((number) => ({ number })),
-            },
-          };
-        },
-      },
-      issues: {
-        async getLabel(params) {
-          calls.push({ api: 'issues.getLabel', params });
-          if (!labelExists) {
-            const error = new Error('Not Found');
-            error.status = 404;
-            throw error;
-          }
-          return { data: { name: params.name } };
-        },
-        async createLabel(params) {
-          calls.push({ api: 'issues.createLabel', params });
-          return { data: { name: params.name } };
-        },
-        async addLabels(params) {
-          calls.push({ api: 'issues.addLabels', params });
-          return { data: [] };
-        },
-        async createComment(params) {
-          calls.push({ api: 'issues.createComment', params });
-          return { data: { id: 1 } };
-        },
-      },
-      pulls: {
-        async update(params) {
-          calls.push({ api: 'pulls.update', params });
-          return { data: { state: params.state } };
-        },
-      },
-    },
-  };
-}
-
-
-// ---------------------------------------------------------------------------
-// PR limit enforcement
-// ---------------------------------------------------------------------------
-
-describe('PR limit enforcement', () => {
-  it('does not close the PR when the author is at the open PR limit', async () => {
-    const github = createGithub({
-      totalCount: 10,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 123],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.openPrCount, 10);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      ['search.issuesAndPullRequests'],
-    );
-  });
-
-  it('counts the new PR when search has not indexed it yet', async () => {
-    const github = createGithub({
-      totalCount: 10,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 11);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'search.issuesAndPullRequests',
-        'issues.getLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('creates the label when it does not already exist', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      labelExists: false,
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'search.issuesAndPullRequests',
-        'issues.getLabel',
-        'issues.createLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-    assert.equal(
-      github.calls.find((call) => call.api === 'issues.createLabel').params.name,
-      'too-many-prs',
-    );
-  });
-
-  it('tolerates a 422 race when creating the label', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-      labelExists: false,
-    });
-    github.rest.issues.createLabel = async (params) => {
-      github.calls.push({ api: 'issues.createLabel', params });
-      const error = new Error('Validation Failed');
-      error.status = 422;
-      throw error;
-    };
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext(),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.deepEqual(
-      github.calls.map((call) => call.api),
-      [
-        'search.issuesAndPullRequests',
-        'issues.getLabel',
-        'issues.createLabel',
-        'issues.addLabels',
-        'issues.createComment',
-        'pulls.update',
-      ],
-    );
-  });
-
-  it('uses a diplomatic close message with the configured limit', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-    });
-
-    await enforcePrLimit({
-      github,
-      context: createContext({ author: 'octo-contributor' }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    const comment = github.calls.find((call) => call.api === 'issues.createComment').params.body;
-    assert.match(comment, /Thank you for your contribution/);
-    assert.match(comment, /limit community contributors to 10 open pull requests/);
-    assert.match(comment, /@octo-contributor/);
-    assert.match(comment, /`pr-limit-exempt` label and reopen/);
-  });
-
-  it('does not close an exempt PR when it is reopened', async () => {
-    const github = createGithub({
-      totalCount: 11,
-      itemNumbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 123],
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ labels: ['PR-LIMIT-EXEMPT'] }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, false);
-    assert.equal(result.exempt, true);
-    assert.equal(result.openPrCount, null);
-    assert.deepEqual(github.calls, []);
-  });
-
-  it('does not over-count when the current PR is not on the first search page', async () => {
-    const github = createGithub({
-      totalCount: 101,
-      itemNumbers: Array.from({ length: 100 }, (_, index) => index + 1),
-    });
-
-    const result = await enforcePrLimit({
-      github,
-      context: createContext({ number: 123 }),
-      core: createCore(),
-      exemptLabelName: 'pr-limit-exempt',
-      maxOpenPrs: 10,
-      labelName: 'too-many-prs',
-    });
-
-    assert.equal(result.closed, true);
-    assert.equal(result.openPrCount, 101);
-  });
-});

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

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

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

@@ -23,14 +23,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install Chrome for Puppeteer
-        run: npx puppeteer browsers install chrome
-
       # Checks the status of hyperlinks in all files
       - name: Run linkspector
         uses: umbrelladocs/action-linkspector@963b6264d7de32c904942a70b488d3407453049e # v1

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

@@ -173,11 +173,11 @@ new SampleDefinition
 ```csharp
 new SampleDefinition
 {
-    Name = "Workflow_Visualization",
-    ProjectPath = "samples/03-workflows/Visualization",
+    Name = "Workflow_Declarative_GenerateCode",
+    ProjectPath = "samples/03-workflows/Declarative/GenerateCode",
     IsDeterministic = true,
-    MustContain = ["Generating workflow visualization...", "Mermaid string:", "DiGraph string:"],
-    ExpectedOutputDescription = ["The output should show workflow visualization in Mermaid and DiGraph formats."],
+    MustContain = ["WORKFLOW: Parsing", "WORKFLOW: Defined"],
+    ExpectedOutputDescription = ["The output should show a YAML workflow being parsed and C# code being generated from it."],
 },
 ```
 

dotnet/Directory.Packages.props

@@ -22,14 +22,14 @@
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
     <!-- Azure.* -->
-    <PackageVersion Include="Azure.AI.AgentServer.Core" Version="1.0.0-beta.25" />
-    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.4" />
-    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.5" />
+    <PackageVersion Include="Azure.AI.AgentServer.Core" Version="1.0.0-beta.23" />
+    <PackageVersion Include="Azure.AI.AgentServer.Invocations" Version="1.0.0-beta.3" />
+    <PackageVersion Include="Azure.AI.AgentServer.Responses" Version="1.0.0-beta.4" />
     <PackageVersion Include="Azure.Search.Documents" Version="12.0.0" />
     <PackageVersion Include="Azure.AI.Projects" Version="2.1.0-beta.2" />
     <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.10" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
-    <PackageVersion Include="Azure.Core" Version="1.56.0" />
+    <PackageVersion Include="Azure.Core" Version="1.55.0" />
     <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="DotNetEnv" Version="3.1.1" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
@@ -44,7 +44,7 @@
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.5" />
-    <PackageVersion Include="System.ClientModel" Version="1.12.0" />
+    <PackageVersion Include="System.ClientModel" Version="1.11.0" />
     <PackageVersion Include="System.CodeDom" Version="10.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />

dotnet/agent-framework-dotnet.slnx

@@ -117,18 +117,17 @@
     <Project Path="samples/02-agents/AgentSkills/Agent_Step03_ClassBasedSkills/Agent_Step03_ClassBasedSkills.csproj" />
     <Project Path="samples/02-agents/AgentSkills/Agent_Step04_MixedSkills/Agent_Step04_MixedSkills.csproj" />
     <Project Path="samples/02-agents/AgentSkills/Agent_Step05_SkillsWithDI/Agent_Step05_SkillsWithDI.csproj" />
-    <Project Path="samples/02-agents/AgentSkills/Agent_Step06_McpBasedSkills/Agent_Step06_McpBasedSkills.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/Harness/">
     <File Path="samples/02-agents/Harness/README.md" />
-    <Project Path="samples/02-agents/Harness/ConsoleReactiveComponents/ConsoleReactiveComponents.csproj" />
-    <Project Path="samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveFramework.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Shared_Console/Harness_Shared_Console.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Shared_Console_OpenAI/Harness_Shared_Console_OpenAI.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step01_Research/Harness_Step01_Research.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step02_Research_WithBackgroundAgents/Harness_Step02_Research_WithBackgroundAgents.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step03_DataProcessing/Harness_Step03_DataProcessing.csproj" />
     <Project Path="samples/02-agents/Harness/Harness_Step04_CodeExecution/Harness_Step04_CodeExecution.csproj" />
+    <Project Path="samples/02-agents/Harness/ConsoleReactiveFramework/ConsoleReactiveFramework.csproj" />
+    <Project Path="samples/02-agents/Harness/ConsoleReactiveComponents/ConsoleReactiveComponents.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/AGUI/Step05_StateManagement/">
     <Project Path="samples/02-agents/AGUI/Step05_StateManagement/Client/Client.csproj" />
@@ -174,7 +173,6 @@
     <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step23_LocalMCP/Agent_Step23_LocalMCP.csproj" />
     <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step24_CodeInterpreterFileDownload/Agent_Step24_CodeInterpreterFileDownload.csproj" />
     <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step25_FoundryToolboxMcp/Agent_Step25_FoundryToolboxMcp.csproj" />
-    <Project Path="samples/02-agents/AgentsWithFoundry/Agent_Step26_FoundryToolboxMcpSkills/Agent_Step26_FoundryToolboxMcpSkills.csproj" />
   </Folder>
   <Folder Name="/Samples/02-agents/Evaluation/">
     <Project Path="samples/02-agents/Evaluation/Evaluation_CustomEvals/Evaluation_CustomEvals.csproj" />
@@ -243,10 +241,11 @@
     <Project Path="samples/03-workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
     <Project Path="samples/03-workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
     <Project Path="samples/03-workflows/Declarative/FunctionTools/FunctionTools.csproj" />
+    <Project Path="samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj" />
     <Project Path="samples/03-workflows/Declarative/HostedWorkflow/HostedWorkflow.csproj" />
     <Project Path="samples/03-workflows/Declarative/InputArguments/InputArguments.csproj" />
-    <Project Path="samples/03-workflows/Declarative/InvokeFoundryToolboxMcp/InvokeFoundryToolboxMcp.csproj" />
     <Project Path="samples/03-workflows/Declarative/InvokeFunctionTool/InvokeFunctionTool.csproj" />
+    <Project Path="samples/03-workflows/Declarative/InvokeFoundryToolboxMcp/InvokeFoundryToolboxMcp.csproj" />
     <Project Path="samples/03-workflows/Declarative/InvokeHttpRequest/InvokeHttpRequest.csproj" />
     <Project Path="samples/03-workflows/Declarative/InvokeMcpTool/InvokeMcpTool.csproj" />
     <Project Path="samples/03-workflows/Declarative/Marketing/Marketing.csproj" />
@@ -598,14 +597,13 @@
     <Project Path="src/Microsoft.Agents.AI.DurableTask/Microsoft.Agents.AI.DurableTask.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Foundry.Hosting/Microsoft.Agents.AI.Foundry.Hosting.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Foundry/Microsoft.Agents.AI.Foundry.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.GitHub.Copilot/Microsoft.Agents.AI.GitHub.Copilot.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Harness/Microsoft.Agents.AI.Harness.csproj" />
+    <Project Path="src/Microsoft.Agents.AI.GitHub.Copilot/Microsoft.Agents.AI.GitHub.Copilot.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.AzureFunctions/Microsoft.Agents.AI.Hosting.AzureFunctions.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting.OpenAI/Microsoft.Agents.AI.Hosting.OpenAI.csproj" />
-    <Project Path="src/Microsoft.Agents.AI.Hosting.AspNetCore/Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hosting/Microsoft.Agents.AI.Hosting.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Hyperlight/Microsoft.Agents.AI.Hyperlight.csproj" />
     <Project Path="src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj" />
@@ -626,8 +624,8 @@
     <Project Path="tests/AnthropicChatCompletion.IntegrationTests/AnthropicChatCompletion.IntegrationTests.csproj" />
     <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
     <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Foundry.Hosting.IntegrationTests.TestContainer/Foundry.Hosting.IntegrationTests.TestContainer.csproj" />
     <Project Path="tests/Foundry.Hosting.IntegrationTests/Foundry.Hosting.IntegrationTests.csproj" />
+    <Project Path="tests/Foundry.Hosting.IntegrationTests.TestContainer/Foundry.Hosting.IntegrationTests.TestContainer.csproj" />
     <Project Path="tests/Foundry.IntegrationTests/Foundry.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/Microsoft.Agents.AI.DurableTask.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.GitHub.Copilot.IntegrationTests/Microsoft.Agents.AI.GitHub.Copilot.IntegrationTests.csproj" />
@@ -652,8 +650,8 @@
     <Project Path="tests/Microsoft.Agents.AI.Declarative.UnitTests/Microsoft.Agents.AI.Declarative.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.DevUI.UnitTests/Microsoft.Agents.AI.DevUI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.DurableTask.UnitTests/Microsoft.Agents.AI.DurableTask.UnitTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Foundry.UnitTests/Microsoft.Agents.AI.Foundry.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests/Microsoft.Agents.AI.Foundry.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests/Microsoft.Agents.AI.GitHub.Copilot.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Harness.UnitTests/Microsoft.Agents.AI.Harness.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.UnitTests/Microsoft.Agents.AI.Hosting.A2A.UnitTests.csproj" />

dotnet/agent-framework-release.slnf

@@ -20,17 +20,14 @@
       "src\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore\\Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj",
       "src\\Microsoft.Agents.AI.Hosting.A2A\\Microsoft.Agents.AI.Hosting.A2A.csproj",
       "src\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore\\Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AspNetCore\\Microsoft.Agents.AI.Hosting.AspNetCore.csproj",
-      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",      
+      "src\\Microsoft.Agents.AI.Hosting.AzureFunctions\\Microsoft.Agents.AI.Hosting.AzureFunctions.csproj",
       "src\\Microsoft.Agents.AI.Hosting.OpenAI\\Microsoft.Agents.AI.Hosting.OpenAI.csproj",
       "src\\Microsoft.Agents.AI.Hosting\\Microsoft.Agents.AI.Hosting.csproj",
-      "src\\Microsoft.Agents.AI.Mcp\\Microsoft.Agents.AI.Mcp.csproj",
       "src\\Microsoft.Agents.AI.Mem0\\Microsoft.Agents.AI.Mem0.csproj",
       "src\\Microsoft.Agents.AI.OpenAI\\Microsoft.Agents.AI.OpenAI.csproj",
       "src\\Microsoft.Agents.AI.Purview\\Microsoft.Agents.AI.Purview.csproj",
       "src\\Microsoft.Agents.AI.Tools.Shell\\Microsoft.Agents.AI.Tools.Shell.csproj",
       "src\\Microsoft.Agents.AI.Workflows.Declarative.Foundry\\Microsoft.Agents.AI.Workflows.Declarative.Foundry.csproj",
-      "src\\Microsoft.Agents.AI.Workflows.Declarative.Mcp\\Microsoft.Agents.AI.Workflows.Declarative.Mcp.csproj",
       "src\\Microsoft.Agents.AI.Workflows.Declarative\\Microsoft.Agents.AI.Workflows.Declarative.csproj",
       "src\\Microsoft.Agents.AI.Workflows.Generators\\Microsoft.Agents.AI.Workflows.Generators.csproj",
       "src\\Microsoft.Agents.AI.Workflows\\Microsoft.Agents.AI.Workflows.csproj",

dotnet/eng/MSBuild/Shared.props

@@ -11,6 +11,9 @@
   <ItemGroup Condition="'$(InjectSharedIntegrationTestAzureCredentialsCode)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\IntegrationTestsAzureCredentials\*.cs" LinkBase="Shared\IntegrationTestsAzureCredentials" />
   </ItemGroup>
+  <ItemGroup Condition="'$(InjectSharedBuildTestCode)' == 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\CodeTests\*.cs" LinkBase="Shared\CodeTests" />
+  </ItemGroup>
   <ItemGroup Condition="'$(InjectSharedWorkflowsExecution)' == 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Workflows\Execution\*.cs" LinkBase="Shared\Workflows" />
   </ItemGroup>

dotnet/eng/verify-samples/AgentsSamples.cs

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

dotnet/eng/verify-samples/WorkflowSamples.cs

@@ -439,6 +439,15 @@ internal static class WorkflowSamples
             ExpectedOutputDescription = ["The output should show a workflow calling function tools (e.g. a menu plugin) to answer a question about restaurant specials."],
         },
 
+        new SampleDefinition
+        {
+            Name = "Workflow_Declarative_GenerateCode",
+            ProjectPath = "samples/03-workflows/Declarative/GenerateCode",
+            IsDeterministic = true,
+            MustContain = ["WORKFLOW: Parsing", "WORKFLOW: Defined"],
+            ExpectedOutputDescription = ["The output should show a YAML workflow being parsed and C# code being generated from it."],
+        },
+
         new SampleDefinition
         {
             Name = "Workflow_Declarative_HostedWorkflow",

dotnet/nuget/nuget-package.props

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

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

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);MAAI001;MCPEXP001</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.OpenAI" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Mcp\Microsoft.Agents.AI.Mcp.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,142 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-// This sample demonstrates how to discover Agent Skills served over MCP.
-//
-// When launched with "--server", this executable runs a small MCP stdio server
-// that exposes a unit-converter skill via the SEP-2640 convention:
-//   - skill://index.json      — discovery document listing all skills
-//   - skill://unit-converter/SKILL.md — the skill instructions
-//
-// In default (client) mode the sample launches itself as a child process,
-// connects via StdioClientTransport, and uses AgentSkillsProviderBuilder
-// to discover and inject the skill into a ChatClientAgent.
-
-using System.ComponentModel;
-using Azure.AI.OpenAI;
-using Azure.Identity;
-using Microsoft.Agents.AI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Server;
-using OpenAI.Responses;
-
-if (args.Length > 0 && args[0] == "--server")
-{
-    await RunMcpServerAsync();
-    return;
-}
-
-// --- Configuration ---
-string openAiEndpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")
-    ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
-
-// --- MCP client + skill discovery ---
-// Launch this same assembly as a stdio MCP server in a child process.
-var thisAssemblyPath = typeof(Program).Assembly.Location;
-Console.WriteLine("Discovering MCP-based skills");
-
-await using McpClient client = await McpClient.CreateAsync(
-    new StdioClientTransport(new()
-    {
-        Name = "skills-server",
-        Command = "dotnet",
-        Arguments = [thisAssemblyPath, "--server"],
-    }));
-
-var skillsProvider = new AgentSkillsProviderBuilder()
-    .UseMcpSkills(client)
-    .Build();
-
-// --- Agent ---
-// WARNING: DefaultAzureCredential is convenient for development but requires careful consideration in production.
-// In production, consider using a specific credential (e.g., ManagedIdentityCredential) to avoid
-// latency issues, unintended credential probing, and potential security risks from fallback mechanisms.
-AIAgent agent = new AzureOpenAIClient(new Uri(openAiEndpoint), new DefaultAzureCredential())
-    .GetResponsesClient()
-    .AsAIAgent(new ChatClientAgentOptions
-    {
-        Name = "SkillsAgent",
-        ChatOptions = new()
-        {
-            Instructions = "You are a helpful assistant. Use available skills to answer the user.",
-        },
-        AIContextProviders = [skillsProvider],
-    },
-    model: deploymentName);
-
-// --- Run ---
-Console.WriteLine(new string('-', 60));
-
-AgentResponse response = await agent.RunAsync(
-    "How many kilometers is a marathon (26.2 miles)? And how many pounds is 75 kilograms?");
-
-Console.WriteLine($"Agent: {response.Text}");
-
-// --- Server mode (launched as a child process via --server) ---------------------------------
-static async Task RunMcpServerAsync()
-{
-    var builder = Host.CreateApplicationBuilder();
-
-    // Critical for stdio transport: any provider that writes to stdout will corrupt the
-    // JSON-RPC channel. Clear all providers; the MCP SDK routes its own diagnostics
-    // appropriately.
-    builder.Logging.ClearProviders();
-    builder.Logging.AddConsole(o => o.LogToStandardErrorThreshold = LogLevel.Trace);
-
-    builder.Services.AddMcpServer(o => o.ServerInfo = new() { Name = "SkillsServer", Version = "1.0.0" })
-    .WithStdioServerTransport()
-    .WithResources<SkillResources>();
-
-    await builder.Build().RunAsync();
-}
-
-#pragma warning disable CA1812 // Discovered by MCP SDK via [McpServerResourceType] attribute
-[McpServerResourceType]
-internal sealed class SkillResources
-#pragma warning restore CA1812
-{
-    private const string IndexJson = """
-        {
-            "$schema": "https://schemas.agentskills.io/discovery/0.2.0/schema.json",
-            "skills": [
-                {
-                    "name": "unit-converter",
-                    "type": "skill-md",
-                    "description": "Convert between common units using a multiplication factor. Use when asked to convert miles, kilometers, pounds, or kilograms.",
-                    "url": "skill://unit-converter/SKILL.md"
-                }
-            ]
-        }
-        """;
-
-    private const string SkillMd = """
-        ---
-        name: unit-converter
-        description: Convert between common units using a multiplication factor. Use when asked to convert miles, kilometers, pounds, or kilograms.
-        ---
-
-        ## Usage
-
-        When the user requests a unit conversion, use these factors:
-
-        | From        | To          | Factor   |
-        |-------------|-------------|----------|
-        | miles       | kilometers  | 1.60934  |
-        | kilometers  | miles       | 0.621371 |
-        | pounds      | kilograms   | 0.453592 |
-        | kilograms   | pounds      | 2.20462  |
-
-        Formula: result = value × factor
-        """;
-
-    [McpServerResource(UriTemplate = "skill://index.json", Name = "Skill Index", MimeType = "application/json")]
-    [Description("SEP-2640 skill discovery index")]
-    public static string GetIndex() => IndexJson;
-
-    [McpServerResource(UriTemplate = "skill://unit-converter/SKILL.md", Name = "Unit Converter Skill", MimeType = "text/markdown")]
-    [Description("Unit converter skill instructions")]
-    public static string GetSkillMd() => SkillMd;
-}

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

@@ -1,34 +0,0 @@
-# MCP-Based Agent Skills Sample
-
-This sample demonstrates how to discover **Agent Skills served over MCP** with a `ChatClientAgent`.
-
-## What it demonstrates
-
-- Hosting a small MCP server (in this same executable, launched with `--server`) that
-  exposes skill resources following the SEP-2640 convention.
-- Connecting an `McpClient` to the embedded server via stdio transport.
-- Building an `AgentSkillsProvider` via `UseMcpSkills(client)`, which reads
-  `skill://index.json` (SEP-2640 canonical discovery) and constructs skills from the
-  index entries.
-- The progressive disclosure pattern across MCP: advertise → load → read resources, exactly
-  as for filesystem-backed skills.
-
-## Running the Sample
-
-### Prerequisites
-
-- .NET 10.0 SDK
-- Azure OpenAI endpoint with a deployed model
-
-### Setup
-
-```powershell
-$env:AZURE_OPENAI_ENDPOINT="https://your-endpoint.openai.azure.com/"
-$env:AZURE_OPENAI_DEPLOYMENT_NAME="gpt-5.4-mini"
-```
-
-### Run
-
-```powershell
-dotnet run
-```

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

@@ -9,7 +9,6 @@ Samples demonstrating Agent Skills capabilities. Each sample shows a different w
 | [Agent_Step03_ClassBasedSkills](Agent_Step03_ClassBasedSkills/) | Define skills as C# classes using `AgentClassSkill`. |
 | [Agent_Step04_MixedSkills](Agent_Step04_MixedSkills/) | **(Advanced)** Combine file-based, code-defined, and class-based skills using `AgentSkillsProviderBuilder`. |
 | [Agent_Step05_SkillsWithDI](Agent_Step05_SkillsWithDI/) | Use Dependency Injection with both code-defined (`AgentInlineSkill`) and class-based (`AgentClassSkill`) skills. |
-| [Agent_Step06_McpBasedSkills](Agent_Step06_McpBasedSkills/) | Discover skills served over the [Model Context Protocol (MCP)](https://modelcontextprotocol.io) via `AgentMcpSkillsSource`. Spins up an in-process MCP server that exposes skills as resources (`skill://...`) and connects an `McpClient` to it. |
 
 ## Key Concepts
 

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

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0</TargetFrameworks>
-
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.AI.Projects" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="ModelContextProtocol" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Foundry\Microsoft.Agents.AI.Foundry.csproj" />
-    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Mcp\Microsoft.Agents.AI.Mcp.csproj" />
-  </ItemGroup>
-
-</Project>

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

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

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

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

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

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

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

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

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

@@ -23,18 +23,16 @@ public record TextPanelProps : ConsoleReactiveProps
 public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiveState>
 {
     /// <summary>
-    /// Calculates the height (in lines) needed to render all items,
-    /// accounting for terminal line wrapping at the specified width.
+    /// Calculates the height (in lines) needed to render all items.
     /// </summary>
     /// <param name="items">The items to measure.</param>
-    /// <param name="terminalWidth">The terminal width in columns. When 0 or negative, wrapping is ignored.</param>
-    /// <returns>The total number of physical lines all items will occupy.</returns>
-    public static int CalculateHeight(IReadOnlyList<string> items, int terminalWidth = 0)
+    /// <returns>The total number of lines all items will occupy.</returns>
+    public static int CalculateHeight(IReadOnlyList<string> items)
     {
         int total = 0;
         for (int i = 0; i < items.Count; i++)
         {
-            total += AnsiEscapes.CountPhysicalLines(items[i], terminalWidth);
+            total += CountLines(items[i]);
         }
 
         return total;
@@ -49,20 +47,13 @@ public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiv
         {
             string text = props.Items[i];
             string[] lines = text.Split('\n');
-            int itemLineCount = AnsiEscapes.CountPhysicalLines(text, props.Width);
-            int itemRow = 0;
+            int lineCount = CountLines(text);
 
-            for (int j = 0; j < lines.Length && itemRow < itemLineCount; j++)
+            for (int j = 0; j < lineCount; j++)
             {
-                int linePhysicalRows = props.Width > 0
-                    ? Math.Max(1, (AnsiEscapes.VisibleLength(lines[j]) - 1) / props.Width + 1)
-                    : 1;
-
                 Console.Write(AnsiEscapes.MoveAndEraseLine(props.Y + currentRow));
                 Console.Write(lines[j]);
-
-                currentRow += linePhysicalRows;
-                itemRow += linePhysicalRows;
+                currentRow++;
             }
         }
 
@@ -75,4 +66,29 @@ public class TextPanel : ConsoleReactiveComponent<TextPanelProps, ConsoleReactiv
             }
         }
     }
+
+    private static int CountLines(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        int count = 1;
+        for (int i = 0; i < text.Length; i++)
+        {
+            if (text[i] == '\n')
+            {
+                count++;
+            }
+        }
+
+        // If text ends with a newline, don't count the trailing empty line
+        if (text[text.Length - 1] == '\n')
+        {
+            count--;
+        }
+
+        return count;
+    }
 }

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

@@ -77,12 +77,36 @@ public class TextScrollPanel : ConsoleReactiveComponent<TextScrollPanelProps, Te
             Console.Write(props.Items[i]);
         }
 
-        // Calculate the offset from bottom for the start of the new last item,
-        // accounting for terminal line wrapping at the available width.
-        int lastItemLines = AnsiEscapes.CountPhysicalLines(props.Items[^1], props.Width);
+        // Calculate the offset from bottom for the start of the new last item
+        int lastItemLines = CountLines(props.Items[^1]);
         this._lastItemOffsetFromBottom = lastItemLines > 0 ? lastItemLines - 1 : 0;
 
         // Update rendered count
         this._renderedCount = props.Items.Count;
     }
+
+    private static int CountLines(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        int count = 1;
+        for (int i = 0; i < text.Length; i++)
+        {
+            if (text[i] == '\n')
+            {
+                count++;
+            }
+        }
+
+        // If text ends with a newline, don't count the trailing empty line
+        if (text[text.Length - 1] == '\n')
+        {
+            count--;
+        }
+
+        return count;
+    }
 }

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

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

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

@@ -28,7 +28,6 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
     private int _scrollRegionBottom;
     private bool _resizedSinceLastRender = true;
     private bool _deactivated;
-    private BottomPanelMode _lastRenderedBottomPanelMode;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="HarnessAppComponent"/> class.
@@ -342,7 +341,7 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
         }
 
         // Calculate queued items panel height
-        int queuedPanelHeight = TextPanel.CalculateHeight(state.QueuedItems, state.ConsoleWidth);
+        int queuedPanelHeight = TextPanel.CalculateHeight(state.QueuedItems);
 
         // Build the bottom panel child based on mode
         ConsoleReactiveComponent bottomChild;
@@ -407,14 +406,6 @@ public class HarnessAppComponent : ConsoleReactiveComponent<ConsoleReactiveProps
             bottomChild = this._textInput;
         }
 
-        // When the bottom panel mode changes, the new child must repaint even if its
-        // props haven't changed — the screen area was overwritten by the previous child.
-        if (state.Mode != this._lastRenderedBottomPanelMode)
-        {
-            bottomChild.Invalidate();
-            this._lastRenderedBottomPanelMode = state.Mode;
-        }
-
         var ruleProps = new TopBottomRuleProps
         {
             Width = state.ConsoleWidth,

dotnet/samples/02-agents/Harness/Harness_Shared_Console/Observers/PlanningOutputObserver.cs

@@ -88,17 +88,16 @@ public sealed class PlanningOutputObserver : ConsoleObserver
         {
             planningResponse = JsonSerializer.Deserialize<PlanningResponse>(collectedText);
         }
-        catch (JsonException)
+        catch (JsonException ex)
         {
-            // JSON parsing failed — fall back to rendering as regular text output.
-            await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+            await ux.WriteInfoLineAsync($"❌ Failed to parse planning response: {ex.Message}", ConsoleColor.Red);
+            await ux.WriteInfoLineAsync($"(raw response) {collectedText}", ConsoleColor.DarkYellow);
             return null;
         }
 
         if (planningResponse is null)
         {
-            // Null result — fall back to rendering as regular text output.
-            await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+            await ux.WriteInfoLineAsync("(no structured response from agent)", ConsoleColor.DarkYellow);
             return null;
         }
 
@@ -119,8 +118,7 @@ public sealed class PlanningOutputObserver : ConsoleObserver
             return new List<FollowUpAction> { this.BuildApprovalAction(question, session) };
         }
 
-        // Unexpected type — fall back to rendering as regular text output.
-        await ux.WriteTextAsync(collectedText).ConfigureAwait(false);
+        await ux.WriteInfoLineAsync($"(unexpected response type: {planningResponse.Type})", ConsoleColor.DarkYellow);
         return null;
     }
 

dotnet/samples/02-agents/Harness/Harness_Shared_Console/ToolFormatters/TodoToolFormatter.cs

@@ -7,20 +7,20 @@ using Microsoft.Extensions.AI;
 namespace Harness.Shared.Console.ToolFormatters;
 
 /// <summary>
-/// Formats <c>todos_*</c> tool calls with tree-view output for added items
+/// Formats <c>TodoList_*</c> tool calls with tree-view output for added items
 /// and structured output for complete/remove operations.
 /// </summary>
 public sealed class TodoToolFormatter : ToolCallFormatter
 {
     /// <inheritdoc/>
-    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("todos_", StringComparison.Ordinal);
+    public override bool CanFormat(FunctionCallContent call) => call.Name.StartsWith("TodoList_", StringComparison.Ordinal);
 
     /// <inheritdoc/>
     public override string? FormatDetail(FunctionCallContent call) => call.Name switch
     {
-        "todos_add" => FormatAddTodos(call),
-        "todos_complete" => FormatCompleteTodos(call),
-        "todos_remove" => FormatIdList(call, "ids", "Remove"),
+        "TodoList_Add" => FormatAddTodos(call),
+        "TodoList_Complete" => FormatCompleteTodos(call),
+        "TodoList_Remove" => FormatIdList(call, "ids", "Remove"),
         _ => null,
     };
 

dotnet/samples/02-agents/Harness/Harness_Shared_Console_OpenAI/OpenAIResponsesErrorObserver.cs

@@ -2,7 +2,6 @@
 
 #pragma warning disable OPENAI001 // Suppress experimental API warnings for Responses API usage.
 
-using System.Text.Json;
 using Harness.Shared.Console.Observers;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
@@ -54,94 +53,9 @@ public sealed class OpenAIResponsesErrorObserver : ConsoleObserver
 
             case StreamingResponseIncompleteUpdate incompleteUpdate:
                 string? reason = incompleteUpdate.Response?.IncompleteStatusDetails?.Reason?.ToString();
-                if (string.Equals(reason, "content_filter", StringComparison.OrdinalIgnoreCase))
-                {
-                    string detail = GetContentFilterDetails(incompleteUpdate);
-                    const string Message = "🛡️  The service's built-in content filter guardrails were triggered and the response was cut short.";
-                    await ux.WriteInfoLineAsync(
-                        string.IsNullOrEmpty(detail) ? Message : $"{Message}\n{detail}",
-                        ConsoleColor.Yellow);
-                }
-                else
-                {
-                    string incompleteText = $"⚠️ Response incomplete: {reason ?? "unknown reason"}";
-                    await ux.WriteInfoLineAsync(incompleteText, ConsoleColor.Yellow);
-                }
-
+                string incompleteText = $"⚠️ Response incomplete: {reason ?? "unknown reason"}";
+                await ux.WriteInfoLineAsync(incompleteText, ConsoleColor.Yellow);
                 break;
         }
     }
-
-    /// <summary>
-    /// Extracts content filter details from the serialized response JSON and returns
-    /// a formatted string showing which specific categories were triggered.
-    /// Returns <see cref="string.Empty"/> if details cannot be extracted.
-    /// </summary>
-    private static string GetContentFilterDetails(StreamingResponseIncompleteUpdate incompleteUpdate)
-    {
-        try
-        {
-            var data = System.ClientModel.Primitives.ModelReaderWriter.Write(incompleteUpdate);
-            using var doc = JsonDocument.Parse(data.ToString());
-            var root = doc.RootElement;
-
-            // Navigate into the nested response object if present.
-            JsonElement responseElement = root.TryGetProperty("response", out var resp) ? resp : root;
-
-            if (!responseElement.TryGetProperty("content_filters", out var filtersArray)
-                || filtersArray.ValueKind != JsonValueKind.Array)
-            {
-                return string.Empty;
-            }
-
-            foreach (var filter in filtersArray.EnumerateArray())
-            {
-                if (!filter.TryGetProperty("content_filter_results", out var results)
-                    || results.ValueKind != JsonValueKind.Object)
-                {
-                    continue;
-                }
-
-                // Collect category data for aligned output.
-                var categories = new List<(string Name, bool Filtered, string? Severity)>();
-                foreach (var category in results.EnumerateObject())
-                {
-                    if (category.Value.ValueKind != JsonValueKind.Object)
-                    {
-                        continue;
-                    }
-
-                    bool filtered = category.Value.TryGetProperty("filtered", out var f) && f.GetBoolean();
-                    string? severity = category.Value.TryGetProperty("severity", out var s) ? s.GetString() : null;
-                    categories.Add((category.Name, filtered, severity));
-                }
-
-                // Build all category lines into a single string.
-                int maxNameLen = categories.Count > 0 ? categories.Max(c => c.Name.Length) : 0;
-                var lines = new List<string>();
-
-                foreach (var (name, filtered, severity) in categories)
-                {
-                    string paddedName = name.PadRight(maxNameLen);
-                    string icon = filtered ? "❌" : "✅";
-                    string statusText = filtered ? "Filtered    " : "Not Filtered";
-                    string severityText = severity is not null ? $"   Severity: {severity}" : "";
-
-                    lines.Add($"    {icon} {paddedName}  {statusText}{severityText}");
-                }
-
-                if (lines.Count > 0)
-                {
-                    return string.Join("\n", lines);
-                }
-            }
-
-            return string.Empty;
-        }
-        catch
-        {
-            // Parsing not critical — skip silently if it fails.
-            return string.Empty;
-        }
-    }
 }

dotnet/samples/03-workflows/Declarative/GenerateCode/GenerateCode.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
+    <NoWarn>$(NoWarn);CA1812</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <InjectSharedThrow>true</InjectSharedThrow>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
+  </ItemGroup>
+
+</Project>

dotnet/samples/03-workflows/Declarative/GenerateCode/Program.cs

@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System.Diagnostics;
+using Microsoft.Agents.AI.Workflows.Declarative;
+
+namespace Demo.DeclarativeEject;
+
+/// <summary>
+/// HOW TO: Convert a workflow from a declartive (yaml based) definition to code.
+/// </summary>
+/// <remarks>
+/// <b>Usage</b>
+/// Provide the path to the workflow definition file as the first argument.
+/// All other arguments are intepreted as a queue of inputs.
+/// When no input is queued, interactive input is requested from the console.
+/// </remarks>
+internal sealed class Program
+{
+    public static void Main(string[] args)
+    {
+        Program program = new(args);
+        program.Execute();
+    }
+
+    private void Execute()
+    {
+        // Read and parse the declarative workflow.
+        Notify($"WORKFLOW: Parsing {Path.GetFullPath(this.WorkflowFile)}");
+
+        Stopwatch timer = Stopwatch.StartNew();
+
+        // Use DeclarativeWorkflowBuilder to generate code based on a YAML file.
+        string code =
+            DeclarativeWorkflowBuilder.Eject(
+                this.WorkflowFile,
+                DeclarativeWorkflowLanguage.CSharp,
+                workflowNamespace: "Demo.DeclarativeCode",
+                workflowPrefix: "Sample");
+
+        Notify($"\nWORKFLOW: Defined {timer.Elapsed}\n");
+
+        Console.WriteLine(code);
+    }
+
+    private const string DefaultWorkflow = "Marketing.yaml";
+
+    private string WorkflowFile { get; }
+
+    private Program(string[] args)
+    {
+        this.WorkflowFile = ParseWorkflowFile(args);
+    }
+
+    private static string ParseWorkflowFile(string[] args)
+    {
+        string workflowFile = args.FirstOrDefault() ?? DefaultWorkflow;
+
+        if (!File.Exists(workflowFile) && !Path.IsPathFullyQualified(workflowFile))
+        {
+            string? repoFolder = GetRepoFolder();
+            if (repoFolder is not null)
+            {
+                workflowFile = Path.Combine(repoFolder, "declarative-agents", "workflow-samples", workflowFile);
+                workflowFile = Path.ChangeExtension(workflowFile, ".yaml");
+            }
+        }
+
+        if (!File.Exists(workflowFile))
+        {
+            throw new InvalidOperationException($"Unable to locate workflow: {Path.GetFullPath(workflowFile)}.");
+        }
+
+        return workflowFile;
+
+        static string? GetRepoFolder()
+        {
+            DirectoryInfo? current = new(Directory.GetCurrentDirectory());
+
+            while (current is not null)
+            {
+                if (Directory.Exists(Path.Combine(current.FullName, ".git")))
+                {
+                    return current.FullName;
+                }
+
+                current = current.Parent;
+            }
+
+            return null;
+        }
+    }
+
+    private static void Notify(string message)
+    {
+        Console.ForegroundColor = ConsoleColor.Cyan;
+        try
+        {
+            Console.WriteLine(message);
+        }
+        finally
+        {
+            Console.ResetColor();
+        }
+    }
+}

dotnet/samples/03-workflows/Declarative/GenerateCode/Properties/launchSettings.json

@@ -0,0 +1,28 @@
+{
+  "profiles": {
+    "Marketing": {
+      "commandName": "Project",
+      "commandLineArgs": "\"Marketing.yaml\""
+    },
+    "MathChat": {
+      "commandName": "Project",
+      "commandLineArgs": "\"MathChat.yaml\""
+    },
+    "Question": {
+      "commandName": "Project",
+      "commandLineArgs": "\"Question.yaml\""
+    },
+    "Research": {
+      "commandName": "Project",
+      "commandLineArgs": "\"DeepResearch.yaml\""
+    },
+    "ResponseObject": {
+      "commandName": "Project",
+      "commandLineArgs": "\"ResponseObject.yaml\""
+    },
+    "UserInput": {
+      "commandName": "Project",
+      "commandLineArgs": "\"UserInput.yaml\""
+    }
+  }
+}

dotnet/samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/SessionFilesClient/SessionFilesClient.csproj

@@ -13,10 +13,8 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.Projects" />
-    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="DotNetEnv" />
-    <PackageReference Include="System.ClientModel" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/SimpleAgent/SimpleAgent.csproj

@@ -13,10 +13,8 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.Projects" />
-    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="DotNetEnv" />
-    <PackageReference Include="System.ClientModel" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/05-end-to-end/A2AClientServer/A2AServer/Program.cs

@@ -101,10 +101,6 @@ else
     throw new ArgumentException("Either A2AServer:ApiKey or A2AServer:ConnectionString & agentName must be provided");
 }
 
-// When running in production, make sure to use an SessionIsolationKeyProvider, e.g. ClaimsIdentity-based
-// if using Claims-based Identity for Authentication/Authorization
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 builder.AddA2AServer(hostA2AAgent);
 
 var app = builder.Build();

dotnet/samples/05-end-to-end/AGUIClientServer/AGUIServer/Program.cs

@@ -49,10 +49,6 @@ var agent = new AzureOpenAIClient(
                 AGUIServerSerializerContext.Default.Options)
         ]);
 
-// When running in production, make sure to use an SessionIsolationKeyProvider, e.g. ClaimsIdentity-based
-// if using Claims-based Identity for Authentication/Authorization
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 // Register the agent with the host and configure it to use an in-memory session store
 // so that conversation state is maintained across requests. In production, you may want to use a persistent session store.
 builder

dotnet/samples/05-end-to-end/AgentWebChat/AgentWebChat.AgentHost/Program.cs

@@ -28,10 +28,6 @@ builder.AddDevUI();
 builder.AddOpenAIChatCompletions();
 builder.AddOpenAIResponses();
 
-// When running in production, make sure to use an SessionIsolationKeyProvider, e.g. ClaimsIdentity-based
-// if using Claims-based Identity for Authentication/Authorization
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 var pirateAgentBuilder = builder.AddAIAgent(
     "pirate",
     instructions: "You are a pirate. Speak like a pirate",
@@ -152,10 +148,6 @@ builder.Services.AddKeyedSingleton<AIAgent>("my-di-matchingname-agent", (sp, nam
 pirateAgentBuilder.AddA2AServer();
 knightsKnavesAgentBuilder.AddA2AServer();
 
-// When running in production, make sure to use an SessionIsolationKeyProvider, e.g. ClaimsIdentity-based
-// if using Claims-based Identity for Authentication/Authorization
-// builder.Services.UseClaimsBasedSessionIsolation(new() { ClaimType = ClaimTypes.NameIdentifier });
-
 var app = builder.Build();
 
 app.MapOpenApi();

dotnet/src/Microsoft.Agents.AI.Abstractions/AgentResponse.cs

@@ -297,7 +297,7 @@ public class AgentResponse
                 AgentId = this.AgentId,
                 ResponseId = this.ResponseId,
                 MessageId = message.MessageId,
-                CreatedAt = message.CreatedAt ?? this.CreatedAt,
+                CreatedAt = this.CreatedAt,
             };
         }
 

dotnet/src/Microsoft.Agents.AI.Foundry/AIProjectClientExtensions.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -12,6 +13,7 @@ using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Foundry;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using OpenAI.Responses;
 
@@ -20,6 +22,7 @@ namespace Azure.AI.Projects;
 /// <summary>
 /// Provides extension methods for <see cref="AIProjectClient"/>.
 /// </summary>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public static partial class AIProjectClientExtensions
 {
     /// <summary>
@@ -371,7 +374,6 @@ public static partial class AIProjectClientExtensions
         if (agentDefinition is DeclarativeAgentDefinition { Tools: { Count: > 0 } definitionTools })
         {
             // Check if no tools were provided while the agent definition requires in-proc tools.
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
             if (requireInvocableTools && chatOptions?.Tools is not { Count: > 0 } && definitionTools.Any(t => t is FunctionTool))
             {
                 throw new ArgumentException("The agent definition in-process tools must be provided in the extension method tools parameter.");
@@ -404,7 +406,6 @@ public static partial class AIProjectClientExtensions
 
                 (agentTools ??= []).Add(responseTool.AsAITool());
             }
-#pragma warning restore OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
             if (requireInvocableTools && missingTools is { Count: > 0 })
             {

dotnet/src/Microsoft.Agents.AI.Foundry/ChatClientAgentFoundryExtensions.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Agents.AI.Foundry;
@@ -15,6 +17,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <c>to_prompt_agent(agent)</c> function for agents whose underlying chat client is a
 /// <see cref="FoundryChatClient"/>.
 /// </summary>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public static class ChatClientAgentFoundryExtensions
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryAITool.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Azure.AI.Projects.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 using OpenAI.Responses;
 
 #pragma warning disable OPENAI001
@@ -26,6 +27,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <c>FoundryAITool.CreateOpenApiTool(definition)</c>
 /// </para>
 /// </remarks>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public static class FoundryAITool
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryAgent.cs

@@ -4,12 +4,14 @@ using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Agents.AI.Foundry;
@@ -34,6 +36,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <c>AsAIAgent</c> extension methods on <see cref="AIProjectClient"/>.
 /// </para>
 /// </remarks>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public sealed class FoundryAgent : DelegatingAIAgent
 {
     /// <summary>
@@ -258,7 +261,6 @@ public sealed class FoundryAgent : DelegatingAIAgent
             return innerAgent;
         }
 
-#pragma warning disable MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         if (innerAgent.ChatClient.GetService<OpenAIRequestPolicies>() is { } policies)
         {
             OpenAIRequestPoliciesReflection.AddPolicyIfMissing(
@@ -266,7 +268,6 @@ public sealed class FoundryAgent : DelegatingAIAgent
                 ClientHeadersPolicy.Instance,
                 PipelinePosition.PerCall);
         }
-#pragma warning restore MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
         return new ClientHeadersAgent(innerAgent);
     }

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryAgentExtensions.cs

@@ -2,11 +2,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using OpenAI.Files;
 using OpenAI.VectorStores;
@@ -21,6 +23,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <see cref="FoundryChatClient"/> at the agent level so callers do not need to drop down to
 /// <c>agent.GetService&lt;FoundryChatClient&gt;().X()</c> for common workflows.
 /// </summary>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public static class FoundryAgentExtensions
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryChatClient.cs

@@ -4,6 +4,7 @@ using System;
 using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -12,6 +13,7 @@ using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects;
 using Azure.AI.Projects.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using OpenAI.Files;
 using OpenAI.Responses;
@@ -51,6 +53,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// behind an Agent Endpoint. It is not synonymous with the Agent Endpoint mode itself.
 /// </para>
 /// </remarks>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public sealed class FoundryChatClient : DelegatingChatClient
 {
     private readonly ChatClientMetadata _metadata;
@@ -649,7 +652,6 @@ public sealed class FoundryChatClient : DelegatingChatClient
     /// <summary>Best-effort registration of <see cref="AgentFrameworkUserAgentPolicy"/> via the MEAI <see cref="OpenAIRequestPolicies"/> hook with at-most-once dedup per pipeline.</summary>
     private static void TryRegisterAgentFrameworkUserAgentPolicy(IChatClient? innerClient)
     {
-#pragma warning disable MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         if (innerClient?.GetService<OpenAIRequestPolicies>() is { } policies)
         {
             // OpenAIRequestPoliciesReflection.AddPolicyIfMissing performs a check-then-add against
@@ -661,7 +663,6 @@ public sealed class FoundryChatClient : DelegatingChatClient
                 AgentFrameworkUserAgentPolicy.Instance,
                 PipelinePosition.PerCall);
         }
-#pragma warning restore MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
     }
 
     /// <summary>
@@ -674,7 +675,6 @@ public sealed class FoundryChatClient : DelegatingChatClient
     /// </summary>
     private static void TryRegisterServedModelPolicy(IChatClient? innerClient)
     {
-#pragma warning disable MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
         if (innerClient?.GetService<OpenAIRequestPolicies>() is { } policies)
         {
             OpenAIRequestPoliciesReflection.AddPolicyIfMissing(
@@ -682,7 +682,6 @@ public sealed class FoundryChatClient : DelegatingChatClient
                 ServedModelPolicy.Instance,
                 PipelinePosition.PerCall);
         }
-#pragma warning restore MEAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
     }
 
     /// <summary>Default OAuth scope for the Azure AI resource. Matches the scope used by <c>Azure.AI.Extensions.OpenAI</c>'s internal authentication helper so the bearer token is accepted by the Foundry control plane.</summary>

dotnet/src/Microsoft.Agents.AI.Foundry/FoundryPromptAgentConverter.cs

@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.AI.Extensions.OpenAI;
 using Azure.AI.Projects;
 using Azure.AI.Projects.Agents;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using OpenAI.Responses;
 
@@ -32,6 +34,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <item><description><b>Agent Endpoint (Mode 3)</b>: throw — no local definition exists to convert.</description></item>
 /// </list>
 /// </remarks>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 internal static class FoundryPromptAgentConverter
 {
     /// <summary>Performs the conversion for an agent whose chat client and chat options are supplied.</summary>

dotnet/src/Microsoft.Agents.AI.Foundry/HostedMcpToolboxAITool.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.AI;
+using Microsoft.Shared.DiagnosticIds;
 
 namespace Microsoft.Agents.AI.Foundry;
 
@@ -21,6 +22,7 @@ namespace Microsoft.Agents.AI.Foundry;
 /// <c>FoundryAITool.CreateHostedMcpToolbox(...)</c> factory overloads.
 /// </para>
 /// </remarks>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public sealed class HostedMcpToolboxAITool : HostedMcpServerTool
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Foundry/Microsoft.Agents.AI.Foundry.csproj

@@ -6,6 +6,7 @@
          related per-agent endpoint surface). Flip back to IsReleased=true once Azure.AI.Projects
          ships a stable 2.1.0. -->
     <InjectSharedThrow>true</InjectSharedThrow>
+    <NoWarn>$(NoWarn);OPENAI001</NoWarn>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />

dotnet/src/Microsoft.Agents.AI.Foundry/ProjectResponsesClientExtensions.cs

@@ -13,6 +13,7 @@ namespace Azure.AI.Extensions.OpenAI;
 /// Provides extension methods for <see cref="ProjectResponsesClient"/>
 /// to simplify the creation of AI agents that work with Azure AI services.
 /// </summary>
+[Experimental(DiagnosticIds.Experiments.AIOpenAIResponses)]
 public static class ProjectResponsesClientExtensions
 {
     /// <summary>

dotnet/src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj

@@ -27,7 +27,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Agents.AI.Hosting.A2A\Microsoft.Agents.AI.Hosting.A2A.csproj" />
-    <ProjectReference Include="..\Microsoft.Agents.AI.Hosting.AspNetCore\Microsoft.Agents.AI.Hosting.AspNetCore.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

dotnet/src/Microsoft.Agents.AI.Hosting.A2A/A2AServerServiceCollectionExtensions.cs

@@ -28,23 +28,6 @@ public static class A2AServerServiceCollectionExtensions
     /// <param name="agentBuilder">The agent builder whose name identifies the agent.</param>
     /// <param name="configureOptions">An optional callback to configure <see cref="A2AServerRegistrationOptions"/>.</param>
     /// <returns>The <paramref name="agentBuilder"/> for chaining.</returns>
-    /// <remarks>
-    /// <para>
-    /// <strong>Trust model.</strong> The A2A <c>contextId</c> arrives from the wire
-    /// and is treated as a chain-resume identifier — <em>not</em> as an authorization
-    /// token. The <see cref="AgentSessionStore"/> contract carries no principal/owner
-    /// dimension, so when a persistent store is registered any caller who knows or
-    /// guesses another caller's <c>contextId</c> can resume that other caller's
-    /// persisted thread. Hosts that serve more than one user must compose a principal
-    /// dimension into the lookup key — typically by calling
-    /// <c>UseClaimsBasedSessionIsolation(...)</c> from
-    /// <c>Microsoft.Agents.AI.Hosting.AspNetCore</c> (or by registering a custom
-    /// <see cref="SessionIsolationKeyProvider"/>). When no isolation provider is
-    /// registered, behavior is unchanged — the bare <c>contextId</c> is used as the
-    /// conversation identifier, which is appropriate for first-run / single-user /
-    /// prototyping scenarios but unsafe for multi-user hosts.
-    /// </para>
-    /// </remarks>
     public static IHostedAgentBuilder AddA2AServer(this IHostedAgentBuilder agentBuilder, Action<A2AServerRegistrationOptions>? configureOptions = null)
     {
         ArgumentNullException.ThrowIfNull(agentBuilder);
@@ -63,13 +46,6 @@ public static class A2AServerServiceCollectionExtensions
     /// <param name="agentName">The name of the agent to create an A2A server for.</param>
     /// <param name="configureOptions">An optional callback to configure <see cref="A2AServerRegistrationOptions"/>.</param>
     /// <returns>The <paramref name="builder"/> for chaining.</returns>
-    /// <remarks>
-    /// See the trust-model remarks on <see cref="AddA2AServer(IHostedAgentBuilder, Action{A2AServerRegistrationOptions}?)"/>
-    /// for guidance on multi-user hosts (the wire <c>contextId</c> is a chain-resume
-    /// identifier, not an authorization token; multi-user hosts must compose a
-    /// principal dimension via <c>UseClaimsBasedSessionIsolation(...)</c> or a custom
-    /// <see cref="SessionIsolationKeyProvider"/>).
-    /// </remarks>
     public static IHostApplicationBuilder AddA2AServer(this IHostApplicationBuilder builder, string agentName, Action<A2AServerRegistrationOptions>? configureOptions = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
@@ -89,13 +65,6 @@ public static class A2AServerServiceCollectionExtensions
     /// <param name="agent">The agent instance to create an A2A server for.</param>
     /// <param name="configureOptions">An optional callback to configure <see cref="A2AServerRegistrationOptions"/>.</param>
     /// <returns>The <paramref name="builder"/> for chaining.</returns>
-    /// <remarks>
-    /// See the trust-model remarks on <see cref="AddA2AServer(IHostedAgentBuilder, Action{A2AServerRegistrationOptions}?)"/>
-    /// for guidance on multi-user hosts (the wire <c>contextId</c> is a chain-resume
-    /// identifier, not an authorization token; multi-user hosts must compose a
-    /// principal dimension via <c>UseClaimsBasedSessionIsolation(...)</c> or a custom
-    /// <see cref="SessionIsolationKeyProvider"/>).
-    /// </remarks>
     public static IHostApplicationBuilder AddA2AServer(this IHostApplicationBuilder builder, AIAgent agent, Action<A2AServerRegistrationOptions>? configureOptions = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
@@ -114,13 +83,6 @@ public static class A2AServerServiceCollectionExtensions
     /// <param name="agentName">The name of the agent to create an A2A server for.</param>
     /// <param name="configureOptions">An optional callback to configure <see cref="A2AServerRegistrationOptions"/>.</param>
     /// <returns>The <paramref name="services"/> for chaining.</returns>
-    /// <remarks>
-    /// See the trust-model remarks on <see cref="AddA2AServer(IHostedAgentBuilder, Action{A2AServerRegistrationOptions}?)"/>
-    /// for guidance on multi-user hosts (the wire <c>contextId</c> is a chain-resume
-    /// identifier, not an authorization token; multi-user hosts must compose a
-    /// principal dimension via <c>UseClaimsBasedSessionIsolation(...)</c> or a custom
-    /// <see cref="SessionIsolationKeyProvider"/>).
-    /// </remarks>
     public static IServiceCollection AddA2AServer(this IServiceCollection services, string agentName, Action<A2AServerRegistrationOptions>? configureOptions = null)
     {
         ArgumentNullException.ThrowIfNull(services);
@@ -152,13 +114,6 @@ public static class A2AServerServiceCollectionExtensions
     /// <param name="agent">The agent instance to create an A2A server for.</param>
     /// <param name="configureOptions">An optional callback to configure <see cref="A2AServerRegistrationOptions"/>.</param>
     /// <returns>The <paramref name="services"/> for chaining.</returns>
-    /// <remarks>
-    /// See the trust-model remarks on <see cref="AddA2AServer(IHostedAgentBuilder, Action{A2AServerRegistrationOptions}?)"/>
-    /// for guidance on multi-user hosts (the wire <c>contextId</c> is a chain-resume
-    /// identifier, not an authorization token; multi-user hosts must compose a
-    /// principal dimension via <c>UseClaimsBasedSessionIsolation(...)</c> or a custom
-    /// <see cref="SessionIsolationKeyProvider"/>).
-    /// </remarks>
     public static IServiceCollection AddA2AServer(this IServiceCollection services, AIAgent agent, Action<A2AServerRegistrationOptions>? configureOptions = null)
     {
         ArgumentNullException.ThrowIfNull(services);
@@ -185,17 +140,9 @@ public static class A2AServerServiceCollectionExtensions
             var agentSessionStore = serviceProvider.GetKeyedService<AgentSessionStore>(agent.Name);
             var runMode = options?.AgentRunMode ?? AgentRunMode.DisallowBackground;
 
-            // Ensure that we have an IsolationKeyScopedAgentSessionStore registered.
-            var isolationKeyProvider = serviceProvider.GetService<SessionIsolationKeyProvider>();
-            if (agentSessionStore?.GetService<IsolationKeyScopedAgentSessionStore>() is null)
-            {
-                agentSessionStore ??= new InMemoryAgentSessionStore();
-                agentSessionStore = new IsolationKeyScopedAgentSessionStore(agentSessionStore, isolationKeyProvider, new() { Strict = isolationKeyProvider != null });
-            }
-
             var hostAgent = new AIHostAgent(
                 innerAgent: agent,
-                sessionStore: agentSessionStore);
+                sessionStore: agentSessionStore ?? new InMemoryAgentSessionStore());
 
             agentHandler = new A2AAgentHandler(hostAgent, runMode);
         }

dotnet/src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/AGUIEndpointRouteBuilderExtensions.cs

@@ -73,26 +73,6 @@ public static class AGUIEndpointRouteBuilderExtensions
     /// it will be used to persist conversation sessions across requests using the AG-UI thread ID as the
     /// conversation identifier. If no session store is registered, sessions are ephemeral (not persisted).
     /// </para>
-    /// <para>
-    /// <strong>Trust model.</strong> The AG-UI <c>RunAgentInput.ThreadId</c> arrives
-    /// from the wire and is treated as a chain-resume identifier — <em>not</em> as an
-    /// authorization token. The <see cref="AgentSessionStore"/> contract carries no
-    /// principal/owner dimension, so when a persistent store is registered any caller
-    /// who knows or guesses another caller's <c>ThreadId</c> can resume that other
-    /// caller's persisted thread. Hosts that serve more than one user must compose a
-    /// principal dimension into the lookup key. The recommended way is to wrap the
-    /// keyed <see cref="AgentSessionStore"/> in
-    /// <see cref="IsolationKeyScopedAgentSessionStore"/>, typically by calling
-    /// <c>UseClaimsBasedSessionIsolation(...)</c> from
-    /// <c>Microsoft.Agents.AI.Hosting.AspNetCore</c> (or by registering a custom
-    /// <see cref="SessionIsolationKeyProvider"/>) and registering the store via the
-    /// <c>WithSessionStore(...)</c> / <c>WithInMemorySessionStore(...)</c> helpers on
-    /// <see cref="IHostedAgentBuilder"/> so that the wrapper is applied. When no
-    /// isolation provider is registered, behavior is unchanged — the bare
-    /// <c>ThreadId</c> is used as the conversation identifier, which is appropriate
-    /// for first-run / single-user / prototyping scenarios but unsafe for
-    /// multi-user hosts.
-    /// </para>
     /// </remarks>
     public static IEndpointConventionBuilder MapAGUI(
         this IEndpointRouteBuilder endpoints,

dotnet/src/Microsoft.Agents.AI.Hosting.AspNetCore/ClaimsIdentitySessionIsolationKeyProvider.cs

@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Shared.Diagnostics;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// A <see cref="SessionIsolationKeyProvider"/> that extracts the session isolation key from a claim
-/// in the current user's identity, as provided by ASP.NET Core's <see cref="IHttpContextAccessor"/>.
-/// </summary>
-/// <remarks>
-/// <para>
-/// This provider is suitable for ASP.NET Core web applications where session isolation is based on
-/// authenticated user identity. It reads a specified claim type (e.g., name, email, or a custom identifier)
-/// from the ambient <see cref="HttpContext"/>.
-/// </para>
-/// <para>
-/// If the <see cref="HttpContext"/> is unavailable, the user is not authenticated, or the specified claim
-/// is missing, the provider returns <see langword="null"/>. The consuming <see cref="IsolationKeyScopedAgentSessionStore"/>
-/// will then enforce strict or pass-through behavior based on its configuration.
-/// </para>
-/// <para>
-/// This class relies on <see cref="IHttpContextAccessor"/>, which uses <see cref="AsyncLocal{T}"/>
-/// to provide access to the current <see cref="HttpContext"/>.
-/// </para>
-/// </remarks>
-public class ClaimsIdentitySessionIsolationKeyProvider : SessionIsolationKeyProvider
-{
-    private readonly IHttpContextAccessor? _httpContextAccessor;
-    private readonly string _claimType;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ClaimsIdentitySessionIsolationKeyProvider"/> class.
-    /// </summary>
-    /// <param name="httpContextAccessor">
-    /// The <see cref="IHttpContextAccessor"/> used to retrieve the current HTTP context and user claims.
-    /// </param>
-    /// <param name="options">The options for configuring the provider. If null, defaults are used.</param>
-    /// <exception cref="ArgumentException">
-    /// <see cref="ClaimsIdentitySessionIsolationKeyProviderOptions.ClaimType"/> is null, empty, or whitespace.
-    /// </exception>
-    public ClaimsIdentitySessionIsolationKeyProvider(
-        IHttpContextAccessor? httpContextAccessor,
-        ClaimsIdentitySessionIsolationKeyProviderOptions? options = null)
-    {
-        options ??= new ClaimsIdentitySessionIsolationKeyProviderOptions();
-        this._httpContextAccessor = httpContextAccessor;
-        this._claimType = Throw.IfNullOrWhitespace(options.ClaimType);
-    }
-
-    /// <summary>
-    /// Extracts the session isolation key from the current user's claims.
-    /// </summary>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests.</param>
-    /// <returns>
-    /// A task that represents the asynchronous operation. The task result contains the value of the
-    /// configured claim type from the current user's identity, or <see langword="null"/> if the claim
-    /// is not present or the HTTP context is unavailable.
-    /// </returns>
-    /// <remarks>
-    /// This method retrieves the claim value from <c>HttpContext.User.Claims</c>. If multiple claims
-    /// of the specified type exist, the first match is returned.
-    /// </remarks>
-    public override ValueTask<string?> GetSessionIsolationKeyAsync(CancellationToken cancellationToken = default)
-    {
-        Claim? claim = this._httpContextAccessor?
-                           .HttpContext?
-                           .User?.Claims.FirstOrDefault(c => c.Type == this._claimType);
-
-        return new ValueTask<string?>(claim?.Value);
-    }
-}

dotnet/src/Microsoft.Agents.AI.Hosting.AspNetCore/ClaimsIdentitySessionIsolationKeyProviderOptions.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Security.Claims;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// Options for configuring <see cref="ClaimsIdentitySessionIsolationKeyProvider"/>.
-/// </summary>
-public class ClaimsIdentitySessionIsolationKeyProviderOptions
-{
-    /// <summary>
-    /// Gets or sets the claim type to extract from the user's identity for session isolation.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Defaults to <see cref="ClaimsIdentity.DefaultNameClaimType"/>, which typically corresponds to
-    /// the user's name or unique identifier claim.
-    /// </para>
-    /// <para>
-    /// Common alternatives include:
-    /// <list type="bullet">
-    /// <item><description><c>ClaimTypes.NameIdentifier</c> — Stable user identifier</description></item>
-    /// <item><description><c>ClaimTypes.Email</c> — Email address</description></item>
-    /// <item><description>Custom claim types specific to your authentication provider</description></item>
-    /// </list>
-    /// </para>
-    /// </remarks>
-    public string ClaimType { get; set; } = ClaimsIdentity.DefaultNameClaimType;
-}

dotnet/src/Microsoft.Agents.AI.Hosting.AspNetCore/Microsoft.Agents.AI.Hosting.AspNetCore.csproj

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>$(TargetFrameworksCore)</TargetFrameworks>
-    <RootNamespace>Microsoft.Agents.AI.Hosting.AspNetCore</RootNamespace>
-    <VersionSuffix>preview</VersionSuffix>
-    <NoWarn>$(NoWarn)</NoWarn>
-  </PropertyGroup>
-
-  <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
-
-  <PropertyGroup>
-    <InjectSharedThrow>true</InjectSharedThrow>
-    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
-    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Agents.AI.Hosting\Microsoft.Agents.AI.Hosting.csproj" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- NuGet Package Settings -->
-    <Title>Microsoft Agent Framework Hosting ASP.NET Core</Title>
-    <Description>Provides Microsoft Agent Framework support for hosting agents in an ASP.NET Core context.</Description>
-  </PropertyGroup>
-</Project>

dotnet/src/Microsoft.Agents.AI.Hosting.AspNetCore/ServiceCollectionExtensions.cs

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// Extension methods for configuring AI hosting services in an <see cref="IServiceCollection"/>.
-/// </summary>
-public static class ServiceCollectionExtensions
-{
-    /// <summary>
-    /// Registers a <see cref="SessionIsolationKeyProvider"/> that uses claims from the current user's identity
-    /// to generate session isolation keys.
-    /// </summary>
-    /// <param name="services">The <see cref="IServiceCollection"/> to add services to.</param>
-    /// <param name="options"> Optional configuration for the claims-based session isolation key provider.</param>
-    /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
-    /// <remarks>
-    /// This method requires <see cref="IHttpContextAccessor"/> to be registered in the service collection.
-    /// Ensure that <c>services.AddHttpContextAccessor()</c> has been called before using this method.
-    /// </remarks>
-    public static IServiceCollection UseClaimsBasedSessionIsolation(
-        this IServiceCollection services,
-        ClaimsIdentitySessionIsolationKeyProviderOptions? options = null)
-    {
-        options ??= new();
-        ServiceDescriptor descriptor = new(typeof(SessionIsolationKeyProvider), CreateIsolationKeyProvider, ServiceLifetime.Singleton);
-        services.Add(descriptor);
-
-        return services;
-
-        object CreateIsolationKeyProvider(IServiceProvider serviceProvider)
-        {
-            IHttpContextAccessor contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-
-            return new ClaimsIdentitySessionIsolationKeyProvider(contextAccessor, options);
-        }
-    }
-}

dotnet/src/Microsoft.Agents.AI.Hosting/AgentSessionStore.cs

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Agents.AI.Hosting;
 
@@ -11,39 +9,9 @@ namespace Microsoft.Agents.AI.Hosting;
 /// Defines the contract for storing and retrieving agent conversation threads.
 /// </summary>
 /// <remarks>
-/// <para>
 /// Implementations of this interface enable persistent storage of conversation threads,
 /// allowing conversations to be resumed across HTTP requests, application restarts,
 /// or different service instances in hosted scenarios.
-/// </para>
-/// <para>
-/// <strong>Trust model.</strong> The <c>conversationId</c> passed to
-/// <see cref="GetSessionAsync"/> and <see cref="SaveSessionAsync"/> typically originates
-/// from the wire (for example, an AG-UI <c>RunAgentInput.ThreadId</c> or an A2A
-/// <c>contextId</c>). It is a chain-resume identifier, <em>not</em> an authorization
-/// token, and the <c>(agent, conversationId)</c> tuple carries no principal/owner
-/// dimension. Hosts that serve more than one user from the same registered store must
-/// therefore compose a principal dimension into the lookup key, otherwise any caller
-/// who knows or guesses another caller's <c>conversationId</c> can resume
-/// that other caller's persisted thread. The framework provides
-/// <see cref="IsolationKeyScopedAgentSessionStore"/> as a decorator that rewrites
-/// <c>conversationId</c> to include an isolation key resolved from a
-/// <see cref="SessionIsolationKeyProvider"/> (for example, the ASP.NET Core
-/// <c>ClaimsIdentitySessionIsolationKeyProvider</c> wired up via
-/// <c>UseClaimsBasedSessionIsolation(...)</c>). When no provider is registered, the
-/// store behaves as a single-namespace persistence layer — appropriate for
-/// single-user / first-run / prototyping scenarios but unsafe for multi-user hosts.
-/// </para>
-/// <para>
-/// <strong>Implementer guidance.</strong> Implementations should treat
-/// <c>conversationId</c> as opaque: do not parse it, do not impose length
-/// or character-set constraints on it, and do not assume it round-trips to the value
-/// the caller originally supplied (decorators such as
-/// <see cref="IsolationKeyScopedAgentSessionStore"/> may rewrite it before forwarding).
-/// Be aware that any logging, telemetry, or audit sink that surfaces
-/// <c>conversationId</c> will also surface the isolation prefix when a
-/// scoping decorator is in the chain.
-/// </para>
 /// </remarks>
 public abstract class AgentSessionStore
 {
@@ -75,35 +43,4 @@ public abstract class AgentSessionStore
         AIAgent agent,
         string conversationId,
         CancellationToken cancellationToken = default);
-
-    /// <summary>Asks the <see cref="AgentSessionStore"/> for an object of the specified type <paramref name="serviceType"/>.</summary>
-    /// <param name="serviceType">The type of object being requested.</param>
-    /// <param name="serviceKey">An optional key that can be used to help identify the target service.</param>
-    /// <returns>The found object, otherwise <see langword="null"/>.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="serviceType"/> is <see langword="null"/>.</exception>
-    /// <remarks>
-    /// The purpose of this method is to allow for the retrieval of strongly-typed services that might be provided by the <see cref="AgentSessionStore"/>,
-    /// including itself or any services it might be wrapping. This is particularly useful for inspecting delegation chains
-    /// to verify that specific store implementations are present.
-    /// </remarks>
-    public virtual object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        _ = Throw.IfNull(serviceType);
-
-        return serviceKey is null && serviceType.IsInstanceOfType(this)
-            ? this
-            : null;
-    }
-
-    /// <summary>Asks the <see cref="AgentSessionStore"/> for an object of type <typeparamref name="TService"/>.</summary>
-    /// <typeparam name="TService">The type of the object to be retrieved.</typeparam>
-    /// <param name="serviceKey">An optional key that can be used to help identify the target service.</param>
-    /// <returns>The found object, otherwise <see langword="null"/>.</returns>
-    /// <remarks>
-    /// The purpose of this method is to allow for the retrieval of strongly typed services that may be provided by the <see cref="AgentSessionStore"/>,
-    /// including itself or any services it might be wrapping. This is particularly useful for inspecting delegation chains
-    /// to verify that specific store implementations are present.
-    /// </remarks>
-    public TService? GetService<TService>(object? serviceKey = null)
-        => this.GetService(typeof(TService), serviceKey) is TService service ? service : default;
 }

dotnet/src/Microsoft.Agents.AI.Hosting/DelegatingAgentSessionStore.cs

@@ -1,81 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Shared.Diagnostics;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// Provides an abstract base class for agent session stores that delegate operations to an inner store
-/// instance while allowing for extensibility and customization.
-/// </summary>
-/// <remarks>
-/// <para>
-/// <see cref="DelegatingAgentSessionStore"/> implements the decorator pattern for <see cref="AgentSessionStore"/>s,
-/// enabling the creation of pipelines where each layer can add functionality while delegating core operations to an
-/// underlying store.
-/// </para>
-/// <para>
-/// The default implementation provides transparent pass-through behavior, forwarding all operations to the inner store.
-/// Derived classes can override specific methods to add custom behavior while maintaining compatibility with the store
-/// interface.
-/// </para>
-/// </remarks>
-public abstract class DelegatingAgentSessionStore : AgentSessionStore
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DelegatingAgentSessionStore"/> class with the specified inner
-    /// store.
-    /// </summary>
-    /// <param name="innerStore">The underlying session store instance that will handle the core operations.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="innerStore"/> is <see langword="null"/>.</exception>
-    /// <remarks>
-    /// The inner session store serves as the foundation of the delegation chain. All operations not overridden by
-    /// derived classes will be forwarded to this store.
-    /// </remarks>
-    protected DelegatingAgentSessionStore(AgentSessionStore innerStore)
-    {
-        this.InnerStore = Throw.IfNull(innerStore);
-    }
-
-    /// <summary>
-    /// Gets the inner session store instance that receives delegated operations.
-    /// </summary>
-    /// <value>
-    /// The underlying <see cref="AgentSessionStore"/> instance that handles core storage operations.
-    /// </value>
-    /// <remarks>
-    /// Derived classes can use this property to access the inner session store for custom delegation scenarios
-    /// or to forward operations with additional processing.
-    /// </remarks>
-    protected AgentSessionStore InnerStore { get; }
-
-    /// <inheritdoc/>
-    public override ValueTask<AgentSession> GetSessionAsync(AIAgent agent, string conversationId, CancellationToken cancellationToken = default)
-        => this.InnerStore.GetSessionAsync(agent, conversationId, cancellationToken);
-
-    /// <inheritdoc/>
-    public override ValueTask SaveSessionAsync(AIAgent agent, string conversationId, AgentSession session, CancellationToken cancellationToken = default)
-        => this.InnerStore.SaveSessionAsync(agent, conversationId, session, cancellationToken);
-
-    /// <inheritdoc/>
-    /// <remarks>
-    /// This implementation first checks if this instance satisfies the service request.
-    /// If not, it chains the request to the inner store, allowing services to be retrieved
-    /// from any store in the delegation chain.
-    /// </remarks>
-    public override object? GetService(Type serviceType, object? serviceKey = null)
-    {
-        // First, check if this instance satisfies the request
-        object? service = base.GetService(serviceType, serviceKey);
-        if (service is not null)
-        {
-            return service;
-        }
-
-        // Chain to the inner store
-        return this.InnerStore.GetService(serviceType, serviceKey);
-    }
-}

dotnet/src/Microsoft.Agents.AI.Hosting/HostedAgentBuilderExtensions.cs

@@ -3,7 +3,6 @@
 using System;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Agents.AI.Hosting;
@@ -17,11 +16,12 @@ public static class HostedAgentBuilderExtensions
     /// Configures the host agent builder to use an in-memory session store for agent session management.
     /// </summary>
     /// <param name="builder">The host agent builder to configure with the in-memory session store.</param>
-    /// <param name="withIsolation">When <see langword="true"/>, wraps the session store with an <see cref="IsolationKeyScopedAgentSessionStore"/>
-    /// to provide isolation-key-based scoping for sessions. Defaults to <see langword="true"/>.</param>
     /// <returns>The same <paramref name="builder"/> instance, configured to use an in-memory session store.</returns>
-    public static IHostedAgentBuilder WithInMemorySessionStore(this IHostedAgentBuilder builder, bool withIsolation = true)
-        => builder.WithSessionStore(new InMemoryAgentSessionStore(), withIsolation);
+    public static IHostedAgentBuilder WithInMemorySessionStore(this IHostedAgentBuilder builder)
+    {
+        builder.ServiceCollection.AddKeyedSingleton<AgentSessionStore>(builder.Name, new InMemoryAgentSessionStore());
+        return builder;
+    }
 
     /// <summary>
     /// Registers the specified agent session store with the host agent builder, enabling session-specific storage for
@@ -29,11 +29,12 @@ public static class HostedAgentBuilderExtensions
     /// </summary>
     /// <param name="builder">The host agent builder to configure with the session store. Cannot be null.</param>
     /// <param name="store">The agent session store instance to register. Cannot be null.</param>
-    /// <param name="withIsolation">When <see langword="true"/>, wraps the session store with an <see cref="IsolationKeyScopedAgentSessionStore"/>
-    /// to provide isolation-key-based scoping for sessions. Defaults to <see langword="true"/>.</param>
     /// <returns>The same host agent builder instance, allowing for method chaining.</returns>
-    public static IHostedAgentBuilder WithSessionStore(this IHostedAgentBuilder builder, AgentSessionStore store, bool withIsolation = true)
-        => builder.WithSessionStore((sp, key) => store, ServiceLifetime.Singleton, withIsolation);
+    public static IHostedAgentBuilder WithSessionStore(this IHostedAgentBuilder builder, AgentSessionStore store)
+    {
+        builder.ServiceCollection.AddKeyedSingleton(builder.Name, store);
+        return builder;
+    }
 
     /// <summary>
     /// Configures the host agent builder to use a custom session store implementation for agent sessions.
@@ -43,36 +44,16 @@ public static class HostedAgentBuilderExtensions
     /// name.</param>
     /// <param name="lifetime">The DI service lifetime for the session store registration. Defaults to <see cref="ServiceLifetime.Singleton"/>
     /// because session stores persist conversation state across requests and are consumed independently of the agent's lifetime.</param>
-    /// <param name="withIsolation">When <see langword="true"/>, wraps the session store with an <see cref="IsolationKeyScopedAgentSessionStore"/>
-    /// to provide isolation-key-based scoping for sessions. Defaults to <see langword="true"/>.</param>
     /// <returns>The same host agent builder instance, enabling further configuration.</returns>
-    public static IHostedAgentBuilder WithSessionStore(this IHostedAgentBuilder builder, Func<IServiceProvider, string, AgentSessionStore> createAgentSessionStore, ServiceLifetime lifetime = ServiceLifetime.Singleton, bool withIsolation = true)
+    public static IHostedAgentBuilder WithSessionStore(this IHostedAgentBuilder builder, Func<IServiceProvider, string, AgentSessionStore> createAgentSessionStore, ServiceLifetime lifetime = ServiceLifetime.Singleton)
     {
         builder.ServiceCollection.AddKeyedService(builder.Name, (sp, key) =>
         {
             Throw.IfNull(key);
             var keyString = key as string;
             Throw.IfNullOrEmpty(keyString);
-
-            AgentSessionStore store = createAgentSessionStore(sp, keyString) ??
+            return createAgentSessionStore(sp, keyString) ??
                 throw new InvalidOperationException($"The agent session store factory did not return a valid {nameof(AgentSessionStore)} instance for key '{keyString}'.");
-
-            if (withIsolation && store.GetService<IsolationKeyScopedAgentSessionStore>() is null)
-            {
-                var isolationKeyProvider = sp.GetService<SessionIsolationKeyProvider>();
-
-                // Best efforts options getting
-                IsolationKeyScopedAgentSessionStoreOptions? options = sp.GetService<IsolationKeyScopedAgentSessionStoreOptions>();
-                if (options is null)
-                {
-                    var optionsProvider = sp.GetService<IOptions<IsolationKeyScopedAgentSessionStoreOptions>>();
-                    options = optionsProvider?.Value;
-                }
-
-                store = new IsolationKeyScopedAgentSessionStore(store, isolationKeyProvider, options ?? new());
-            }
-
-            return store;
         }, lifetime);
         return builder;
     }

dotnet/src/Microsoft.Agents.AI.Hosting/IsolationKeyScopedAgentSessionStore.cs

@@ -1,109 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// A delegating <see cref="AgentSessionStore"/> that scopes session keys by an isolation key
-/// provided by a <see cref="SessionIsolationKeyProvider"/>, ensuring that sessions are isolated
-/// per logical partition (e.g., user, tenant, or composite key).
-/// </summary>
-public class IsolationKeyScopedAgentSessionStore : DelegatingAgentSessionStore
-{
-    private readonly SessionIsolationKeyProvider? _keyProvider;
-    private readonly bool _strict;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="IsolationKeyScopedAgentSessionStore"/> class.
-    /// </summary>
-    /// <param name="innerStore">The underlying <see cref="AgentSessionStore"/> to delegate to.</param>
-    /// <param name="keyProvider">
-    /// The <see cref="SessionIsolationKeyProvider"/> used to retrieve the isolation key for the current context.
-    /// </param>
-    /// <param name="options">The options for configuring the session store. If null, defaults are used.</param>
-    /// <exception cref="ArgumentNullException">
-    /// <paramref name="innerStore"/> is <see langword="null"/>.
-    /// </exception>
-    public IsolationKeyScopedAgentSessionStore(
-        AgentSessionStore innerStore,
-        SessionIsolationKeyProvider? keyProvider,
-        IsolationKeyScopedAgentSessionStoreOptions? options = null)
-        : base(innerStore)
-    {
-        this._keyProvider = keyProvider;
-        options ??= new IsolationKeyScopedAgentSessionStoreOptions();
-        this._strict = options.Strict;
-    }
-
-    /// <summary>
-    /// Asynchronously retrieves the isolation key from the provider and validates it if in strict mode.
-    /// </summary>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    /// <returns>
-    /// The isolation key string, or <see langword="null"/> if no key is available and non-strict mode is enabled.
-    /// </returns>
-    /// <exception cref="InvalidOperationException">
-    /// The provider returned <see langword="null"/> and strict mode is enabled.
-    /// </exception>
-    private async ValueTask<string?> GetIsolationKeyAsync(CancellationToken cancellationToken)
-    {
-        string? key = this._keyProvider != null
-                    ? await this._keyProvider.GetSessionIsolationKeyAsync(cancellationToken).ConfigureAwait(false)
-                    : null;
-
-        if (this._strict && key == null)
-        {
-            throw new InvalidOperationException("Session isolation key is required but was not provided by the configured SessionIsolationKeyProvider.");
-        }
-
-        return key;
-    }
-
-    /// <summary>
-    /// Escapes special characters in the isolation key to ensure unambiguous scoped conversation IDs.
-    /// </summary>
-    /// <param name="key">The raw isolation key.</param>
-    /// <returns>The escaped isolation key.</returns>
-    /// <remarks>
-    /// Backslashes are escaped first (\ becomes \\), then colons (: becomes \:).
-    /// This ensures the scoped conversation ID format {key}::{conversationId} can be parsed correctly.
-    /// </remarks>
-    private static string EscapeIsolationKey(string key) => key.Replace("\\", "\\\\").Replace(":", "\\:");
-
-    /// <summary>
-    /// Constructs a scoped conversation ID by prefixing the bare conversation ID with the escaped isolation key.
-    /// </summary>
-    /// <param name="bareConversationId">The original conversation ID.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    /// <returns>
-    /// The scoped conversation ID in the format {escapedKey}::{conversationId}, or the bare conversation ID
-    /// if no isolation key is available and non-strict mode is enabled.
-    /// </returns>
-    private async ValueTask<string> GetScopedConversationIdAsync(string bareConversationId, CancellationToken cancellationToken)
-    {
-        string? key = await this.GetIsolationKeyAsync(cancellationToken).ConfigureAwait(false);
-        if (key == null)
-        {
-            return bareConversationId;
-        }
-
-        return $"{EscapeIsolationKey(key)}::{bareConversationId}";
-    }
-
-    /// <inheritdoc />
-    public override async ValueTask<AgentSession> GetSessionAsync(AIAgent agent, string conversationId, CancellationToken cancellationToken = default)
-    {
-        string scopedConversationId = await this.GetScopedConversationIdAsync(conversationId, cancellationToken).ConfigureAwait(false);
-        return await this.InnerStore.GetSessionAsync(agent, scopedConversationId, cancellationToken).ConfigureAwait(false);
-    }
-
-    /// <inheritdoc />
-    public override async ValueTask SaveSessionAsync(AIAgent agent, string conversationId, AgentSession session, CancellationToken cancellationToken = default)
-    {
-        string scopedConversationId = await this.GetScopedConversationIdAsync(conversationId, cancellationToken).ConfigureAwait(false);
-        await this.InnerStore.SaveSessionAsync(agent, scopedConversationId, session, cancellationToken).ConfigureAwait(false);
-    }
-}

dotnet/src/Microsoft.Agents.AI.Hosting/IsolationKeyScopedAgentSessionStoreOptions.cs

@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// Options for configuring <see cref="IsolationKeyScopedAgentSessionStore"/>.
-/// </summary>
-public class IsolationKeyScopedAgentSessionStoreOptions
-{
-    /// <summary>
-    /// Gets or sets a value indicating whether an exception should be thrown when the isolation key cannot be determined.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// If <see langword="true"/> (default), the store will throw an <see cref="System.InvalidOperationException"/>
-    /// when <see cref="SessionIsolationKeyProvider.GetSessionIsolationKeyAsync"/> returns <see langword="null"/>.
-    /// </para>
-    /// <para>
-    /// If <see langword="false"/>, the conversation ID is passed through unmodified when the isolation key is absent,
-    /// allowing unscoped access to the underlying session store. This mode is suitable for development scenarios
-    /// or mixed environments where not all requests have isolation keys.
-    /// </para>
-    /// </remarks>
-    public bool Strict { get; set; } = true;
-}

dotnet/src/Microsoft.Agents.AI.Hosting/Local/InMemoryAgentSessionStore.cs

@@ -24,20 +24,6 @@ namespace Microsoft.Agents.AI.Hosting;
 /// For production use with multiple instances or persistence across restarts, use a durable storage implementation
 /// such as Redis, SQL Server, or Azure Cosmos DB.
 /// </para>
-/// <para>
-/// <strong>Multi-user warning.</strong> This store keys threads by
-/// <c>(agent.Id, conversationId)</c> only — it has no principal/owner dimension. When
-/// the conversation identifier originates from the wire (for example, an AG-UI
-/// <c>RunAgentInput.ThreadId</c> or an A2A <c>contextId</c>), any caller who knows
-/// or guesses another caller's identifier can resume that other caller's persisted
-/// thread. Multi-user hosts must wrap this store in
-/// <see cref="IsolationKeyScopedAgentSessionStore"/> (typically by calling
-/// <c>UseClaimsBasedSessionIsolation(...)</c> from
-/// <c>Microsoft.Agents.AI.Hosting.AspNetCore</c> or by registering a custom
-/// <see cref="SessionIsolationKeyProvider"/>) so that the conversation namespace is
-/// scoped per principal. See the trust-model remarks on
-/// <see cref="AgentSessionStore"/> for the full background.
-/// </para>
 /// </remarks>
 public sealed class InMemoryAgentSessionStore : AgentSessionStore
 {

dotnet/src/Microsoft.Agents.AI.Hosting/SessionIsolationKeyProvider.cs

@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Agents.AI.Hosting;
-
-/// <summary>
-/// Provides an abstract base class for resolving session isolation keys used to scope agent sessions.
-/// </summary>
-/// <remarks>
-/// <para>
-/// Session isolation keys enable multi-tenant or multi-user scenarios by scoping agent session storage
-/// to a specific logical partition (e.g., user ID, tenant ID, or composite key). Derived classes
-/// implement the key resolution logic appropriate to their hosting environment.
-/// </para>
-/// <para>
-/// When a key is unavailable or cannot be determined, implementations should return <see langword="null"/>.
-/// The consuming session store can then enforce strict behavior (throwing an exception) or fall back
-/// to unscoped storage based on its configuration.
-/// </para>
-/// </remarks>
-public abstract class SessionIsolationKeyProvider
-{
-    /// <summary>
-    /// Asynchronously retrieves the session isolation key for the current request or execution context.
-    /// </summary>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests.</param>
-    /// <returns>
-    /// A task that represents the asynchronous operation. The task result contains the isolation key string,
-    /// or <see langword="null"/> if no key is available in the current context.
-    /// </returns>
-    /// <remarks>
-    /// Implementations should extract the key from ambient context (e.g., HTTP request headers, claims,
-    /// or environment variables). If the key cannot be determined, return <see langword="null"/> to allow
-    /// the caller to decide on strict vs. pass-through behavior.
-    /// </remarks>
-    public abstract ValueTask<string?> GetSessionIsolationKeyAsync(CancellationToken cancellationToken = default);
-}

dotnet/src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj

@@ -4,15 +4,13 @@
     <TargetFrameworks>$(TargetFrameworksCore)</TargetFrameworks>
     <RootNamespace>Microsoft.Agents.AI.Mcp</RootNamespace>
     <VersionSuffix>alpha</VersionSuffix>
-    <NoWarn>$(NoWarn);MEAI001;MAAI001;MCPEXP001</NoWarn>
-    
+    <NoWarn>$(NoWarn);MEAI001;MCPEXP001</NoWarn>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
 
   <PropertyGroup>
     <InjectSharedThrow>true</InjectSharedThrow>
-    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
   </PropertyGroup>
 
@@ -36,8 +34,4 @@
     <InternalsVisibleTo Include="Microsoft.Agents.AI.Mcp.UnitTests" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
-  </ItemGroup>
-
 </Project>

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/AgentMcpSkill.cs

@@ -1,133 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Shared.Diagnostics;
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// An <see cref="AgentSkill"/> discovered from an MCP server exposing the Agent Skills convention.
-/// </summary>
-/// <remarks>
-/// <para>
-/// The skill is constructed from <c>skill://index.json</c> discovery metadata only; <see cref="GetContentAsync"/>
-/// fetches the full <c>SKILL.md</c> content from the MCP server on demand via <c>resources/read</c>.
-/// </para>
-/// <para>
-/// Per SEP-2640, resources referenced inside SKILL.md are fetched on demand via the originating MCP
-/// server: <see cref="GetResourceAsync"/> resolves a relative resource name against the
-/// skill's root URI, issues a <c>resources/read</c> request, and returns an <see cref="AgentMcpSkillResource"/>
-/// with pre-fetched content.
-/// </para>
-/// </remarks>
-internal sealed class AgentMcpSkill : AgentSkill
-{
-    private const string SkillMdSuffix = "SKILL.md";
-
-    private readonly McpClient _client;
-    private readonly string _skillMdUri;
-    private readonly string _skillRootUri;
-    private string? _content;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AgentMcpSkill"/> class.
-    /// </summary>
-    /// <param name="frontmatter">The parsed frontmatter metadata for this skill.</param>
-    /// <param name="skillMdUri">
-    /// The full MCP resource URI of the <c>SKILL.md</c> resource (e.g. <c>skill://unit-converter/SKILL.md</c>).
-    /// Used by <see cref="GetContentAsync"/> to fetch the skill content on demand. The skill's root URI
-    /// (used to resolve sibling resources) is derived by stripping the trailing <c>SKILL.md</c> segment.
-    /// </param>
-    /// <param name="client">The MCP client used to fetch resources on demand.</param>
-    public AgentMcpSkill(AgentSkillFrontmatter frontmatter, string skillMdUri, McpClient client)
-    {
-        this.Frontmatter = Throw.IfNull(frontmatter);
-        this._skillMdUri = Throw.IfNullOrWhitespace(skillMdUri);
-        this._skillRootUri = ComputeSkillRootUri(skillMdUri);
-        this._client = Throw.IfNull(client);
-    }
-
-    /// <inheritdoc/>
-    public override AgentSkillFrontmatter Frontmatter { get; }
-
-    /// <inheritdoc/>
-    /// <remarks>
-    /// Fetches the <c>SKILL.md</c> content from the MCP server via <c>resources/read</c> on the first call
-    /// and caches the result.
-    /// </remarks>
-    public override async ValueTask<string> GetContentAsync(CancellationToken cancellationToken = default)
-    {
-        if (this._content is not null)
-        {
-            return this._content;
-        }
-
-#pragma warning disable CA2234 // Pass system uri objects instead of strings
-        ReadResourceResult result = await this._client.ReadResourceAsync(this._skillMdUri, cancellationToken: cancellationToken).ConfigureAwait(false);
-#pragma warning restore CA2234 // Pass system uri objects instead of strings
-
-        string text = string.Join("\n", result.Contents.OfType<TextResourceContents>().Select(c => c.Text));
-
-        if (text.Length == 0)
-        {
-            throw new InvalidOperationException($"The MCP server returned no text content for SKILL.md resource '{this._skillMdUri}'.");
-        }
-
-        return this._content = text;
-    }
-
-    /// <inheritdoc/>
-    /// <remarks>
-    /// Resolves <paramref name="name"/> as a relative path against the skill's root URI, issues a
-    /// <c>resources/read</c> request to the MCP server, and returns an <see cref="AgentMcpSkillResource"/>
-    /// with the pre-fetched content. Returns <see langword="null"/> when the name is empty, the server
-    /// returns no content, or the resource does not exist on the server.
-    /// </remarks>
-    public override async ValueTask<AgentSkillResource?> GetResourceAsync(string name, CancellationToken cancellationToken = default)
-    {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            return null;
-        }
-
-        string uri = this._skillRootUri + name;
-
-        ReadResourceResult result;
-        try
-        {
-#pragma warning disable CA2234 // Pass system uri objects instead of strings
-            result = await this._client.ReadResourceAsync(uri, cancellationToken: cancellationToken).ConfigureAwait(false);
-#pragma warning restore CA2234 // Pass system uri objects instead of strings
-        }
-        catch (Exception ex) when (ex is not OperationCanceledException)
-        {
-            return null;
-        }
-
-        return new AgentMcpSkillResource(name: name, result: result);
-    }
-
-    /// <summary>
-    /// Strips the trailing <c>SKILL.md</c> from the URI to produce the skill's root directory URI.
-    /// If the URI doesn't end with <c>SKILL.md</c>, ensures it ends with a trailing slash.
-    /// </summary>
-    private static string ComputeSkillRootUri(string skillMdUri)
-    {
-        if (skillMdUri.EndsWith(SkillMdSuffix, StringComparison.Ordinal))
-        {
-            return skillMdUri.Substring(0, skillMdUri.Length - SkillMdSuffix.Length);
-        }
-
-        if (skillMdUri.EndsWith("/", StringComparison.Ordinal))
-        {
-            return skillMdUri;
-        }
-
-        return skillMdUri + "/";
-    }
-}

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/AgentMcpSkillResource.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.AI;
-using Microsoft.Shared.Diagnostics;
-using ModelContextProtocol;
-using ModelContextProtocol.Protocol;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// An <see cref="AgentSkillResource"/> backed by content fetched from an MCP server.
-/// </summary>
-/// <remarks>
-/// The <see cref="ReadResourceResult"/> is fetched eagerly by <see cref="AgentMcpSkill.GetResourceAsync"/>
-/// at construction time; <see cref="ReadAsync"/> extracts the content from the result.
-/// </remarks>
-internal sealed class AgentMcpSkillResource : AgentSkillResource
-{
-    private readonly ReadResourceResult _result;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AgentMcpSkillResource"/> class with a pre-fetched result.
-    /// </summary>
-    /// <param name="name">The resource name (e.g. a relative path or identifier).</param>
-    /// <param name="result">The result returned by the MCP server's <c>resources/read</c> request.</param>
-    /// <param name="description">An optional description of the resource.</param>
-    public AgentMcpSkillResource(string name, ReadResourceResult result, string? description = null)
-        : base(Throw.IfNullOrWhitespace(name), description)
-    {
-        this._result = Throw.IfNull(result);
-    }
-
-    /// <inheritdoc/>
-    /// <returns>
-    /// A <see cref="DataContent"/> when the resource contains binary content, a <see cref="string"/> when
-    /// it contains text, or <see langword="null"/> when the server returned no content blocks.
-    /// </returns>
-    public override Task<object?> ReadAsync(IServiceProvider? serviceProvider = null, CancellationToken cancellationToken = default)
-    {
-        BlobResourceContents? blob = this._result.Contents.OfType<BlobResourceContents>().FirstOrDefault();
-        if (blob is not null)
-        {
-            return Task.FromResult<object?>(blob.ToAIContent());
-        }
-
-        string text = string.Join("\n", this._result.Contents.OfType<TextResourceContents>().Select(c => c.Text));
-
-        if (text.Length == 0)
-        {
-            return Task.FromResult<object?>(null);
-        }
-
-        return Task.FromResult<object?>(text);
-    }
-}

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/AgentMcpSkillsSource.cs

@@ -1,182 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Shared.Diagnostics;
-using ModelContextProtocol;
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// An <see cref="AgentSkillsSource"/> that discovers Agent Skills served over the Model Context Protocol (MCP).
-/// </summary>
-/// <remarks>
-/// <para>
-/// Discovery follows the SEP-2640 recommended approach: the source reads the well-known
-/// <c>skill://index.json</c> resource and constructs one <see cref="AgentSkill"/> per
-/// <c>skill-md</c> entry directly from the entry's <c>name</c>, <c>description</c>, and <c>url</c> fields.
-/// The referenced <c>SKILL.md</c> resource is not read during discovery; hosts fetch its body on
-/// demand via <c>resources/read</c> against the URI exposed on the resulting skill.
-/// </para>
-/// <para>
-/// Only index entries of type <c>skill-md</c> are supported at the moment; entries of any other
-/// type are skipped.
-/// </para>
-/// <para>
-/// If <c>skill://index.json</c> is absent, unreadable, empty, or fails to parse, this source
-/// returns an empty list. Discovered skills serve their referenced resources on demand via
-/// <see cref="AgentSkill.GetResourceAsync"/>; they do not enumerate sibling files up front.
-/// </para>
-/// </remarks>
-internal sealed partial class AgentMcpSkillsSource : AgentSkillsSource
-{
-    /// <summary>
-    /// SEP-2640 canonical discovery document URI.
-    /// </summary>
-    private const string IndexUri = "skill://index.json";
-
-    private const string SkillMdEntryType = "skill-md";
-
-    private readonly McpClient _client;
-    private readonly ILogger _logger;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AgentMcpSkillsSource"/> class.
-    /// </summary>
-    /// <param name="client">An MCP client connected to a server that exposes Agent Skills resources.</param>
-    /// <param name="loggerFactory">Optional logger factory.</param>
-    public AgentMcpSkillsSource(McpClient client, ILoggerFactory? loggerFactory = null)
-    {
-        this._client = Throw.IfNull(client);
-        this._logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<AgentMcpSkillsSource>();
-    }
-
-    /// <inheritdoc/>
-    public override async Task<IList<AgentSkill>> GetSkillsAsync(CancellationToken cancellationToken = default)
-    {
-        McpSkillIndex? index = await this.TryReadIndexAsync(cancellationToken).ConfigureAwait(false);
-
-        var skills = new List<AgentSkill>();
-
-        foreach (var entry in index?.Skills ?? [])
-        {
-            if (this.TryCreateSkill(entry, out AgentMcpSkill? skill, out string skipReason))
-            {
-                skills.Add(skill);
-                LogSkillLoaded(this._logger, skill.Frontmatter.Name);
-            }
-            else
-            {
-                LogIndexEntrySkipped(this._logger, entry.Name ?? "(unnamed)", skipReason);
-            }
-        }
-
-        LogSkillsLoadedTotal(this._logger, skills.Count);
-
-        return skills;
-    }
-
-    private async Task<McpSkillIndex?> TryReadIndexAsync(CancellationToken cancellationToken)
-    {
-        ReadResourceResult result;
-
-        try
-        {
-#pragma warning disable CA2234 // Pass system uri objects instead of strings
-            result = await this._client.ReadResourceAsync(IndexUri, cancellationToken: cancellationToken).ConfigureAwait(false);
-#pragma warning restore CA2234 // Pass system uri objects instead of strings
-        }
-        catch (McpException ex) when (ex is McpProtocolException pex && pex.ErrorCode == McpErrorCode.ResourceNotFound)
-        {
-            LogIndexAbsent(this._logger, ex.Message);
-            return null;
-        }
-        catch (McpException ex)
-        {
-            LogIndexReadFailed(this._logger, ex);
-            return null;
-        }
-
-        string? indexText = result.Contents.OfType<TextResourceContents>().FirstOrDefault()?.Text;
-        if (string.IsNullOrWhiteSpace(indexText))
-        {
-            LogIndexEmpty(this._logger);
-            return null;
-        }
-
-        try
-        {
-            return JsonSerializer.Deserialize(indexText, McpJsonContext.Default.McpSkillIndex);
-        }
-        catch (JsonException ex)
-        {
-            LogIndexParseFailed(this._logger, ex);
-            return null;
-        }
-    }
-
-    private bool TryCreateSkill(
-        McpSkillIndexEntry entry,
-        [NotNullWhen(true)] out AgentMcpSkill? skill,
-        out string skipReason)
-    {
-        skill = null;
-
-        if (!string.Equals(entry.Type, SkillMdEntryType, StringComparison.Ordinal))
-        {
-            skipReason = $"unsupported type '{entry.Type ?? "(none)"}'";
-            return false;
-        }
-
-        if (string.IsNullOrWhiteSpace(entry.Url))
-        {
-            skipReason = "missing required 'url' field";
-            return false;
-        }
-
-        AgentSkillFrontmatter frontmatter;
-        try
-        {
-            frontmatter = new AgentSkillFrontmatter(entry.Name!, entry.Description!);
-        }
-        catch (ArgumentException ex)
-        {
-            skipReason = $"invalid metadata: {ex.Message}";
-            return false;
-        }
-
-        skill = new AgentMcpSkill(frontmatter, entry.Url!, this._client);
-        skipReason = string.Empty;
-        return true;
-    }
-
-    [LoggerMessage(LogLevel.Information, "Loaded MCP skill: {SkillName}")]
-    private static partial void LogSkillLoaded(ILogger logger, string skillName);
-
-    [LoggerMessage(LogLevel.Information, "Successfully loaded {Count} skills from MCP server")]
-    private static partial void LogSkillsLoadedTotal(ILogger logger, int count);
-
-    [LoggerMessage(LogLevel.Debug, "No skill://index.json resource available on MCP server: {Reason}")]
-    private static partial void LogIndexAbsent(ILogger logger, string reason);
-
-    [LoggerMessage(LogLevel.Warning, "Failed to read skill://index.json from MCP server.")]
-    private static partial void LogIndexReadFailed(ILogger logger, Exception exception);
-
-    [LoggerMessage(LogLevel.Debug, "skill://index.json on MCP server returned empty/non-text contents")]
-    private static partial void LogIndexEmpty(ILogger logger);
-
-    [LoggerMessage(LogLevel.Warning, "Failed to parse skill://index.json JSON document.")]
-    private static partial void LogIndexParseFailed(ILogger logger, Exception exception);
-
-    [LoggerMessage(LogLevel.Debug, "Skipping skill index entry '{SkillName}': {Reason}")]
-    private static partial void LogIndexEntrySkipped(ILogger logger, string skillName, string reason);
-}

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/AgentSkillsProviderBuilderMcpExtensions.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using Microsoft.Shared.Diagnostics;
-using ModelContextProtocol.Client;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// MCP-specific extension methods for <see cref="AgentSkillsProviderBuilder"/>.
-/// </summary>
-public static class AgentSkillsProviderBuilderMcpExtensions
-{
-    /// <summary>
-    /// Adds a skill source that discovers skills served over MCP via the supplied <paramref name="client"/>.
-    /// </summary>
-    /// <param name="builder">The builder to extend.</param>
-    /// <param name="client">An MCP client connected to a server exposing Agent Skills resources.</param>
-    /// <returns>The builder instance for chaining.</returns>
-    public static AgentSkillsProviderBuilder UseMcpSkills(this AgentSkillsProviderBuilder builder, McpClient client)
-    {
-        _ = Throw.IfNull(builder);
-        _ = Throw.IfNull(client);
-
-        return builder.UseSource(new AgentMcpSkillsSource(client));
-    }
-}

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/McpJsonContext.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// Source-generated JSON context for MCP-skills well-known DTOs.
-/// </summary>
-[JsonSourceGenerationOptions(JsonSerializerDefaults.Web, AllowTrailingCommas = true, ReadCommentHandling = JsonCommentHandling.Skip)]
-[JsonSerializable(typeof(McpSkillIndex))]
-[JsonSerializable(typeof(McpSkillIndexEntry))]
-internal sealed partial class McpJsonContext : JsonSerializerContext;

dotnet/src/Microsoft.Agents.AI.Mcp/Skills/McpSkillIndex.cs

@@ -1,96 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace Microsoft.Agents.AI;
-
-/// <summary>
-/// DTO for the skill discovery index document served at <c>skill://index.json</c>.
-/// </summary>
-/// <remarks>
-/// <para>
-/// Schema reference: <see href="https://schemas.agentskills.io/discovery/0.2.0/schema.json"/>
-/// (Agent Skills Discovery v0.2.0), as bound to MCP by SEP-2640. The MCP binding differs from the
-/// base schema in two ways: the <c>url</c> field contains a full MCP resource URI, and the
-/// <c>digest</c> field is omitted (integrity is the transport's concern over an authenticated
-/// MCP connection).
-/// </para>
-/// <para>
-/// All properties are nullable so that deserialization succeeds even when the server-side index
-/// is incomplete or malformed; callers MUST validate required fields before use.
-/// </para>
-/// </remarks>
-internal sealed class McpSkillIndex
-{
-    /// <summary>
-    /// Gets or sets the opaque schema identifier URI. Required by the base schema; clients SHOULD
-    /// match this against known schema URIs (e.g.
-    /// <c>https://schemas.agentskills.io/discovery/0.2.0/schema.json</c>) before processing the index.
-    /// </summary>
-    [JsonPropertyName("$schema")]
-    public string? Schema { get; set; }
-
-    /// <summary>
-    /// Gets or sets the array of skill entries. Required by the schema; an empty or missing
-    /// <c>skills</c> array means the index advertises no skills.
-    /// </summary>
-    [JsonPropertyName("skills")]
-    public List<McpSkillIndexEntry>? Skills { get; set; }
-}
-
-/// <summary>
-/// A single entry in the skill discovery index.
-/// </summary>
-/// <remarks>
-/// Field requirements per the v0.2.0 schema and the SEP-2640 binding:
-/// <list type="bullet">
-///   <item><description><c>type</c>, <c>description</c>, and <c>url</c> are REQUIRED.</description></item>
-///   <item><description><c>name</c> is REQUIRED for <c>skill-md</c> and <c>archive</c> entries; OMITTED for <c>mcp-resource-template</c>.</description></item>
-///   <item><description><c>digest</c> is part of the base schema but OMITTED under the SEP-2640 MCP binding; carried here for compatibility with non-MCP indices.</description></item>
-/// </list>
-/// All properties are nullable to keep deserialization lenient; callers validate required fields before use.
-/// </remarks>
-internal sealed class McpSkillIndexEntry
-{
-    /// <summary>
-    /// Gets or sets the skill name (1-64 chars, lowercase alphanumeric and hyphens; no leading,
-    /// trailing, or consecutive hyphens). Required for <c>skill-md</c> and <c>archive</c> entries;
-    /// omitted for <c>mcp-resource-template</c>.
-    /// </summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
-
-    /// <summary>
-    /// Gets or sets the entry distribution type. Required. Schema-defined values are
-    /// <c>skill-md</c> and <c>archive</c>; the SEP-2640 MCP binding additionally defines
-    /// <c>mcp-resource-template</c>.
-    /// </summary>
-    [JsonPropertyName("type")]
-    public string? Type { get; set; }
-
-    /// <summary>
-    /// Gets or sets the skill description (max 1024 chars per the Agent Skills specification).
-    /// Required. For <c>skill-md</c> entries, SHOULD match the <c>description</c> in the skill's
-    /// <c>SKILL.md</c> frontmatter.
-    /// </summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>
-    /// Gets or sets the artifact URL. Required. For <c>skill-md</c>, points at the
-    /// <c>SKILL.md</c> resource. For <c>archive</c>, points at the archive file. For
-    /// <c>mcp-resource-template</c>, an RFC 6570 URI template that resolves to a <c>SKILL.md</c>
-    /// resource URI.
-    /// </summary>
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
-
-    /// <summary>
-    /// Gets or sets the SHA-256 digest of the artifact bytes (e.g. <c>sha256:abcd1234...</c>).
-    /// Required by the base v0.2.0 schema, but OMITTED under the SEP-2640 MCP binding because
-    /// integrity is the transport's concern over an authenticated MCP connection.
-    /// </summary>
-    [JsonPropertyName("digest")]
-    public string? Digest { get; set; }
-}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ActionTemplate.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
+using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal abstract class ActionTemplate : CodeTemplate, IModeledAction
+{
+    public string Id { get; private set; } = string.Empty;
+
+    public string Name { get; private set; } = string.Empty;
+
+    public string ParentId { get; private set; } = string.Empty;
+
+    public bool UseAgentProvider { get; init; }
+
+    protected TAction Initialize<TAction>(TAction model) where TAction : DialogAction
+    {
+        this.Id = model.GetId();
+        this.ParentId = model.GetParentId() ?? WorkflowActionVisitor.Steps.Root();
+        this.Name = this.Id.FormatType();
+
+        return model;
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/AddConversationMessageTemplate.cs

@@ -0,0 +1,395 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
+    using Microsoft.Agents.ObjectModel;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class AddConversationMessageTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Adds a new message to the specified agent conversation\n/// </s" +
+                    "ummary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExe" +
+                    "cutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", session)\n{\n    // <inheritdoc />\n    protected override async ValueTask<object" +
+                    "?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)\n " +
+                    "   {");
+ 
+        EvaluateStringExpression(this.Model.ConversationId, "conversationId", isNullable: true); 
+            this.Write("\n        if (string.IsNullOrWhiteSpace(conversationId))\n        {\n            thr" +
+                    "ow new DeclarativeActionException($\"Conversation identifier must be defined: {th" +
+                    "is.Id}\");\n        }\n        ChatMessage newMessage = new(ChatRole.");
+            this.Write(this.ToStringHelper.ToStringWithCulture(FormatEnum(this.Model.Role, RoleMap)));
+            this.Write(", await this.GetContentAsync(context).ConfigureAwait(false)) { AdditionalProperti" +
+                    "es = this.GetMetadata() };\n        newMessage = await agentProvider.CreateMessag" +
+                    "eAsync(conversationId, newMessage, cancellationToken).ConfigureAwait(false);");
+
+        AssignVariable(this.Message, "newMessage");
+        
+            this.Write("\n        return default;\n    }\n\n    private async ValueTask<IList<AIContent>> Get" +
+                    "ContentAsync(IWorkflowContext context)\n    {\n        List<AIContent> content = [" +
+                    "];\n        ");
+
+        int index = 0;
+        foreach (AddConversationMessageContent content in this.Model.Content)
+        {
+           ++index;
+            EvaluateMessageTemplate(content.Value, $"contentValue{index}");
+            AgentMessageContentType contentType = content.Type.Value;
+            if (contentType == AgentMessageContentType.ImageUrl)
+            {
+            this.Write("\n        content.Add(UriContent(contentValue");
+            this.Write(this.ToStringHelper.ToStringWithCulture(index));
+            this.Write(", \"image/*\"));");
+
+            }
+            else if (contentType == AgentMessageContentType.ImageFile)
+            {
+            this.Write("\n        content.Add(new HostedFileContent(contentValue");
+            this.Write(this.ToStringHelper.ToStringWithCulture(index));
+            this.Write("));");
+
+            }
+            else
+            {
+            this.Write("\n        content.Add(new TextContent(contentValue");
+            this.Write(this.ToStringHelper.ToStringWithCulture(index));
+            this.Write("));");
+
+            }
+        }
+            this.Write("\n        return content;\n    }\n\n    private AdditionalPropertiesDictionary? GetMe" +
+                    "tadata()\n    {");
+ 
+        EvaluateRecordExpression<object>(this.Model.Metadata, "metadata"); 
+            this.Write("\n\n        if (metadata is null)\n        {\n            return null;    \n        }\n" +
+                    "\n        return new AdditionalPropertiesDictionary(metadata);\n    }\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+
+void EvaluateRecordExpression<TValue>(ObjectExpression<RecordDataValue> expression, string targetVariable)
+{
+    string resultTypeName = $"Dictionary<string, {GetTypeAlias<TValue>()}?>?";
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = null;");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" =\n            ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatDataValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(">(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateExpressionAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateExpressionAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultTypeName));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+
+void EvaluateStringExpression(StringExpression expression, string targetVariable, bool isNullable = false)
+{
+    string typeName = isNullable ? "string?" : "string";
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(isNullable ? "null" : "string.Empty"));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+        if (expression.LiteralValue.Contains("\n"))
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = \n            \"\"\"\n            ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.LiteralValue));
+
+this.Write("\n            \"\"\";");
+
+ 
+        }
+        else
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+        }
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<string>(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<string>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<string>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+
+void EvaluateMessageTemplate(TemplateLine templateLine, string variableName)
+{
+    if (templateLine is not null)
+    {
+this.Write("\n        string ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
+
+this.Write(" =\n            await context.FormatTemplateAsync(\n                \"\"\"");
+
+
+                FormatMessageTemplate(templateLine); 
+this.Write("\n                \"\"\");");
+
+
+    }
+    else
+    {
+this.Write("\n        string? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(variableName));
+
+this.Write(" = null;");
+
+
+    }
+}
+
+void FormatMessageTemplate(TemplateLine line)
+{
+    foreach (string text in line.ToTemplateString().ByLine())
+    { 
+this.Write("\n                ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(text));
+
+
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/AddConversationMessageTemplate.tt

@@ -0,0 +1,67 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Extensions" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateRecordExpressionTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateStringExpressionTemplate.tt" once="true" #>
+<#@ include file="Snippets/FormatMessageTemplate.tt" once="true" #>
+/// <summary>
+/// Adds a new message to the specified agent conversation
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {<# 
+        EvaluateStringExpression(this.Model.ConversationId, "conversationId", isNullable: true); #>
+        if (string.IsNullOrWhiteSpace(conversationId))
+        {
+            throw new DeclarativeActionException($"Conversation identifier must be defined: {this.Id}");
+        }
+        ChatMessage newMessage = new(ChatRole.<#= FormatEnum(this.Model.Role, RoleMap) #>, await this.GetContentAsync(context).ConfigureAwait(false)) { AdditionalProperties = this.GetMetadata() };
+        newMessage = await agentProvider.CreateMessageAsync(conversationId, newMessage, cancellationToken).ConfigureAwait(false);<#
+        AssignVariable(this.Message, "newMessage");
+        #>
+        return default;
+    }
+
+    private async ValueTask<IList<AIContent>> GetContentAsync(IWorkflowContext context)
+    {
+        List<AIContent> content = [];
+        <#
+        int index = 0;
+        foreach (AddConversationMessageContent content in this.Model.Content)
+        {
+           ++index;
+            EvaluateMessageTemplate(content.Value, $"contentValue{index}");
+            AgentMessageContentType contentType = content.Type.Value;
+            if (contentType == AgentMessageContentType.ImageUrl)
+            {#>
+        content.Add(UriContent(contentValue<#= index #>, "image/*"));<#
+            }
+            else if (contentType == AgentMessageContentType.ImageFile)
+            {#>
+        content.Add(new HostedFileContent(contentValue<#= index #>));<#
+            }
+            else
+            {#>
+        content.Add(new TextContent(contentValue<#= index #>));<#
+            }
+        }#>
+        return content;
+    }
+
+    private AdditionalPropertiesDictionary? GetMetadata()
+    {<# 
+        EvaluateRecordExpression<object>(this.Model.Metadata, "metadata"); #>
+
+        if (metadata is null)
+        {
+            return null;    
+        }
+
+        return new AdditionalPropertiesDictionary(metadata);
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/AddConversationMessageTemplateCode.cs

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Extensions.AI;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class AddConversationMessageTemplate
+{
+    public AddConversationMessageTemplate(AddConversationMessage model)
+    {
+        this.Model = this.Initialize(model);
+        this.Message = this.Model.Message?.Path;
+        this.UseAgentProvider = true;
+    }
+
+    public AddConversationMessage Model { get; }
+
+    public PropertyPath? Message { get; }
+
+    public const string DefaultRole = nameof(ChatRole.User);
+
+    public static readonly FrozenDictionary<AgentMessageRoleWrapper, string> RoleMap =
+        new Dictionary<AgentMessageRoleWrapper, string>()
+        {
+            [AgentMessageRoleWrapper.Get(AgentMessageRole.User)] = nameof(ChatRole.User),
+            [AgentMessageRoleWrapper.Get(AgentMessageRole.Agent)] = nameof(ChatRole.Assistant),
+        }.ToFrozenDictionary();
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ClearAllVariablesTemplate.cs

@@ -0,0 +1,221 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using System.Collections.Generic;
+    using Microsoft.Agents.ObjectModel;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class ClearAllVariablesTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Reset all the state for the targeted variable scope.\n/// </sum" +
+                    "mary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session) : ActionExecutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", session)\n{\n    // <inheritdoc />\n    protected override async ValueTask<object" +
+                    "?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)\n " +
+                    "   {");
+
+        EvaluateEnumExpression<VariablesToClearWrapper, string>(this.Model.Variables, "targetScopeName", ScopeMap, isNullable: true); 
+            this.Write("\n        await context.QueueClearScopeAsync(targetScopeName).ConfigureAwait(false" +
+                    ");\n\n        return default;\n    }\n}\n");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+
+void EvaluateEnumExpression<TWrapper, TValue>(
+    EnumExpression<TWrapper> expression, 
+    string targetVariable,
+    IDictionary<TWrapper, string> resultMap,
+    string defaultValue = null,
+    bool qualifyResult = false,
+    bool isNullable = false)
+        where TWrapper : EnumWrapper
+{
+    string resultType = $"{GetTypeAlias<TValue>()}{(isNullable ? "?" : "")}";
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatValue<TValue>(defaultValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    { 
+        resultMap.TryGetValue(expression.LiteralValue, out string resultValue);
+        if (qualifyResult)
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(".");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultValue));
+
+this.Write(";");
+
+ 
+        }
+        else
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatValue<TValue>(resultValue)));
+
+this.Write(";");
+
+ 
+        }
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(">(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(resultType));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ClearAllVariablesTemplate.tt

@@ -0,0 +1,21 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateEnumExpressionTemplate.tt" once="true" #>
+/// <summary>
+/// Reset all the state for the targeted variable scope.
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {<#
+        EvaluateEnumExpression<VariablesToClearWrapper, string>(this.Model.Variables, "targetScopeName", ScopeMap, isNullable: true); #>
+        await context.QueueClearScopeAsync(targetScopeName).ConfigureAwait(false);
+
+        return default;
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ClearAllVariablesTemplateCode.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class ClearAllVariablesTemplate
+{
+    public ClearAllVariablesTemplate(ClearAllVariables model)
+    {
+        this.Model = this.Initialize(model);
+    }
+
+    public ClearAllVariables Model { get; }
+
+    public static readonly FrozenDictionary<VariablesToClearWrapper, string?> ScopeMap =
+        new Dictionary<VariablesToClearWrapper, string?>()
+        {
+            [VariablesToClearWrapper.Get(VariablesToClear.AllGlobalVariables)] = VariableScopeNames.Global,
+            [VariablesToClearWrapper.Get(VariablesToClear.ConversationScopedVariables)] = WorkflowFormulaState.DefaultScopeName,
+        }.ToFrozenDictionary();
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CodeTemplate.cs

@@ -0,0 +1,339 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using System;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal abstract class CodeTemplate
+{
+    private bool _endsWithNewline;
+
+    private string CurrentIndentField { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Create the template output
+    /// </summary>
+    public abstract string TransformText();
+
+    #region Object Model helpers
+
+    public static string VariableName(PropertyPath path) => Throw.IfNull(path.VariableName);
+    public static string VariableScope(PropertyPath path) => Throw.IfNull(path.NamespaceAlias);
+
+    public static string FormatBoolValue(bool? value, bool defaultValue = false) =>
+        value ?? defaultValue ? "true" : "false";
+
+    public static string FormatStringValue(string? value)
+    {
+        if (value is null)
+        {
+            return "null";
+        }
+
+        if (value.Contains('\n') || value.Contains('\r'))
+        {
+            return @$"""""""{Environment.NewLine}{value}{Environment.NewLine}""""""";
+        }
+
+        if (value.Contains('"') || value.Contains('\\'))
+        {
+            return @$"""""""{value}""""""";
+        }
+
+        return @$"""{value}""";
+    }
+
+    public static string FormatValue<TValue>(string? value)
+    {
+        if (typeof(TValue) == typeof(string))
+        {
+            return FormatStringValue(value);
+        }
+
+        if (value is null)
+        {
+            return "null";
+        }
+
+        if (typeof(TValue).IsEnum)
+        {
+            return $"{typeof(TValue).Name}.{value}";
+        }
+
+        return $"{value}";
+    }
+
+    public static string FormatDataValue(DataValue value) =>
+        value switch
+        {
+            BlankDataValue => "null",
+            BooleanDataValue booleanValue => FormatBoolValue(booleanValue.Value),
+            FloatDataValue decimalValue => $"{decimalValue.Value}",
+            NumberDataValue numberValue => $"{numberValue.Value}",
+            DateDataValue dateValue => $"new DateTime({dateValue.Value.Ticks}, DateTimeKind.{dateValue.Value.Kind})",
+            DateTimeDataValue datetimeValue => $"new DateTimeOffset({datetimeValue.Value.Ticks}, TimeSpan.FromTicks({datetimeValue.Value.Offset}))",
+            TimeDataValue timeValue => $"TimeSpan.FromTicks({timeValue.Value.Ticks})",
+            StringDataValue stringValue => FormatStringValue(stringValue.Value),
+            OptionDataValue optionValue => @$"""{optionValue.Value}""",
+            // Indenting is important here to make the generated code readable.  Don't change it without testing the output.
+            RecordDataValue recordValue =>
+                $"""
+                [
+                                {string.Join(",\n                ", recordValue.Properties.Select(p => $"[\"{p.Key}\"] = {FormatDataValue(p.Value)}"))}
+                            ]
+                """,
+            _ => throw new DeclarativeModelException($"Unable to format '{value.GetType().Name}'"),
+        };
+
+    public static TTarget FormatEnum<TSource, TTarget>(TSource value, IDictionary<TSource, TTarget> map, TTarget? defaultValue = default)
+    {
+        if (map.TryGetValue(value, out TTarget? target))
+        {
+            return target;
+        }
+
+        if (defaultValue is null)
+        {
+            throw new DeclarativeModelException($"No default value suppied for '{typeof(TTarget).Name}'");
+        }
+
+        return defaultValue;
+    }
+
+    public static string GetTypeAlias<TValue>() => GetTypeAlias(typeof(TValue));
+
+    public static string GetTypeAlias(Type type)
+    {
+        return type switch
+        {
+            Type t when t == typeof(bool) => "bool",
+            Type t when t == typeof(byte) => "byte",
+            Type t when t == typeof(sbyte) => "sbyte",
+            Type t when t == typeof(char) => "char",
+            Type t when t == typeof(decimal) => "decimal",
+            Type t when t == typeof(double) => "double",
+            Type t when t == typeof(float) => "float",
+            Type t when t == typeof(int) => "int",
+            Type t when t == typeof(uint) => "uint",
+            Type t when t == typeof(long) => "long",
+            Type t when t == typeof(ulong) => "ulong",
+            Type t when t == typeof(nint) => "nint",
+            Type t when t == typeof(nuint) => "nuint",
+            Type t when t == typeof(short) => "short",
+            Type t when t == typeof(ushort) => "ushort",
+            Type t when t == typeof(string) => "string",
+            Type t when t == typeof(object) => "object",
+            _ => type.Name
+        };
+    }
+    #endregion
+
+    #region Properties
+    /// <summary>
+    /// The string builder that generation-time code is using to assemble generated output
+    /// </summary>
+    public StringBuilder GenerationEnvironment
+    {
+        get
+        {
+            return field ??= new StringBuilder();
+        }
+        set;
+    }
+    /// <summary>
+    /// The error collection for the generation process
+    /// </summary>
+    public CompilerErrorCollection Errors => field ??= [];
+
+    /// <summary>
+    /// A list of the lengths of each indent that was added with PushIndent
+    /// </summary>
+    private List<int> IndentLengths { get => field ??= []; }
+
+    /// <summary>
+    /// Gets the current indent we use when adding lines to the output
+    /// </summary>
+    public string CurrentIndent
+    {
+        get
+        {
+            return this.CurrentIndentField;
+        }
+    }
+    /// <summary>
+    /// Current transformation session
+    /// </summary>
+    public virtual IDictionary<string, object>? Session { get; set; }
+
+    #endregion
+
+    #region Transform-time helpers
+
+    /// <summary>
+    /// Write text directly into the generated output
+    /// </summary>
+    public void Write(string textToAppend)
+    {
+        if (string.IsNullOrEmpty(textToAppend))
+        {
+            return;
+        }
+        // If we're starting off, or if the previous text ended with a newline,
+        // we have to append the current indent first.
+        if ((this.GenerationEnvironment.Length == 0)
+                    || this._endsWithNewline)
+        {
+            this.GenerationEnvironment.Append(this.CurrentIndentField);
+            this._endsWithNewline = false;
+        }
+        // Check if the current text ends with a newline
+        if (textToAppend.EndsWith(Environment.NewLine, StringComparison.CurrentCulture))
+        {
+            this._endsWithNewline = true;
+        }
+        // This is an optimization. If the current indent is "", then we don't have to do any
+        // of the more complex stuff further down.
+        if (this.CurrentIndentField.Length == 0)
+        {
+            this.GenerationEnvironment.Append(textToAppend);
+            return;
+        }
+        // Everywhere there is a newline in the text, add an indent after it
+        textToAppend = textToAppend.Replace(Environment.NewLine, Environment.NewLine + this.CurrentIndentField);
+        // If the text ends with a newline, then we should strip off the indent added at the very end
+        // because the appropriate indent will be added when the next time Write() is called
+        if (this._endsWithNewline)
+        {
+            this.GenerationEnvironment.Append(textToAppend, 0, textToAppend.Length - this.CurrentIndentField.Length);
+        }
+        else
+        {
+            this.GenerationEnvironment.Append(textToAppend);
+        }
+    }
+
+    /// <summary>
+    /// Write text directly into the generated output
+    /// </summary>
+    public void WriteLine(string textToAppend)
+    {
+        this.Write(textToAppend);
+        this.GenerationEnvironment.AppendLine();
+        this._endsWithNewline = true;
+    }
+
+    /// <summary>
+    /// Write formatted text directly into the generated output
+    /// </summary>
+    public void Write(string format, params object[] args)
+    {
+        this.Write(string.Format(CultureInfo.CurrentCulture, format, args));
+    }
+
+    /// <summary>
+    /// Write formatted text directly into the generated output
+    /// </summary>
+    public void WriteLine(string format, params object[] args)
+    {
+        this.WriteLine(string.Format(CultureInfo.CurrentCulture, format, args));
+    }
+
+    /// <summary>
+    /// Raise an error
+    /// </summary>
+    public void Error(string message)
+    {
+        CompilerError error = new()
+        {
+            ErrorText = message
+        };
+        this.Errors.Add(error);
+    }
+
+    /// <summary>
+    /// Raise a warning
+    /// </summary>
+    public void Warning(string message)
+    {
+        CompilerError error = new()
+        {
+            ErrorText = message,
+            IsWarning = true
+        };
+        error.ErrorText = message;
+        error.IsWarning = true;
+        this.Errors.Add(error);
+    }
+
+    /// <summary>
+    /// Increase the indent
+    /// </summary>
+    public void PushIndent(string indent)
+    {
+        if (indent is null)
+        {
+            throw new ArgumentNullException(nameof(indent));
+        }
+        this.CurrentIndentField += indent;
+        this.IndentLengths.Add(indent.Length);
+    }
+
+    /// <summary>
+    /// Remove the last indent that was added with PushIndent
+    /// </summary>
+    public string PopIndent()
+    {
+        string returnValue = string.Empty;
+        if (this.IndentLengths.Count > 0)
+        {
+            int indentLength = this.IndentLengths[this.IndentLengths.Count - 1];
+            this.IndentLengths.RemoveAt(this.IndentLengths.Count - 1);
+            if (indentLength > 0)
+            {
+                returnValue = this.CurrentIndentField.Substring(this.CurrentIndentField.Length - indentLength);
+                this.CurrentIndentField = this.CurrentIndentField.Remove(this.CurrentIndentField.Length - indentLength);
+            }
+        }
+        return returnValue;
+    }
+
+    /// <summary>
+    /// Remove any indentation
+    /// </summary>
+    public void ClearIndent()
+    {
+        this.IndentLengths.Clear();
+        this.CurrentIndentField = string.Empty;
+    }
+
+    #endregion
+
+    #region ToString Helpers
+
+    /// <summary>
+    /// Utility class to produce culture-oriented representation of an object as a string.
+    /// </summary>
+    public sealed class ToStringInstanceHelper
+    {
+        /// <summary>
+        /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+        /// </summary>
+#pragma warning disable CA1822 // Required to be non-static for use in generated code
+        public string ToStringWithCulture(object objectToConvert) => $"{objectToConvert}";
+#pragma warning restore CA1822
+    }
+
+    /// <summary>
+    /// Helper to produce culture-oriented representation of an object as a string
+    /// </summary>
+    public ToStringInstanceHelper ToStringHelper { get; } = new();
+
+    #endregion
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ConditionGroupTemplate.cs

@@ -0,0 +1,172 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class ConditionGroupTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Conditional branching similar to an if / elseif / elseif / els" +
+                    "e chain.\n/// </summary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session) : ActionExecutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", session)\n{\n    // <inheritdoc />\n    protected override async ValueTask<object" +
+                    "?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)\n " +
+                    "   {");
+
+        for (int index = 0; index < this.Model.Conditions.Length; ++index)
+        {
+            ConditionItem conditionItem = this.Model.Conditions[index];
+            if (conditionItem.Condition is null)
+            {
+                continue; // Skip if no condition is defined
+            }
+
+            EvaluateBoolExpression(conditionItem.Condition, $"condition{index}");
+            this.Write("\n        if (condition");
+            this.Write(this.ToStringHelper.ToStringWithCulture(index));
+            this.Write(")\n        {\n            return \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(ConditionGroupExecutor.Steps.Item(this.Model, conditionItem)));
+            this.Write("\";\n        }\n        ");
+
+        }
+        
+            this.Write("\n        return \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(ConditionGroupExecutor.Steps.Else(this.Model)));
+            this.Write("\";\n    }\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+
+void EvaluateBoolExpression(BoolExpression expression, string targetVariable, bool defaultValue = false)
+{
+    if (expression is null)
+    {
+this.Write("\n        bool ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatBoolValue(defaultValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+this.Write("\n        bool ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatBoolValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        bool ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<bool>(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        bool ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<bool>>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        bool ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<bool>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ConditionGroupTemplate.tt

@@ -0,0 +1,34 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.ObjectModel" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateBoolExpressionTemplate.tt" once="true" #>
+/// <summary>
+/// Conditional branching similar to an if / elseif / elseif / else chain.
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {<#
+        for (int index = 0; index < this.Model.Conditions.Length; ++index)
+        {
+            ConditionItem conditionItem = this.Model.Conditions[index];
+            if (conditionItem.Condition is null)
+            {
+                continue; // Skip if no condition is defined
+            }
+
+            EvaluateBoolExpression(conditionItem.Condition, $"condition{index}");#>
+        if (condition<#= index #>)
+        {
+            return "<#= ConditionGroupExecutor.Steps.Item(this.Model, conditionItem)#>";
+        }
+        <#
+        }
+        #>
+        return "<#= ConditionGroupExecutor.Steps.Else(this.Model)#>";
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ConditionGroupTemplateCode.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class ConditionGroupTemplate
+{
+    public ConditionGroupTemplate(ConditionGroup model)
+    {
+        this.Model = this.Initialize(model);
+    }
+
+    public ConditionGroup Model { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CopyConversationMessagesTemplate.cs

@@ -0,0 +1,324 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.ObjectModel;
+    using Microsoft.Extensions.AI;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class CopyConversationMessagesTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Copies one or more messages into the specified agent conversat" +
+                    "ion.\n/// </summary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExe" +
+                    "cutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", session)\n{\n    // <inheritdoc />\n    protected override async ValueTask<object" +
+                    "?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)\n " +
+                    "   {");
+
+        EvaluateStringExpression(this.Model.ConversationId, "conversationId", isNullable: true); 
+            this.Write("\n        if (string.IsNullOrWhiteSpace(conversationId))\n        {\n            thr" +
+                    "ow new DeclarativeActionException($\"Conversation identifier must be defined: {th" +
+                    "is.Id}\");\n        }");
+
+        EvaluateValueExpression<ChatMessage[]>(this.Model.Messages, "messages");
+        
+            this.Write(@"
+        if (messages is not null)
+        {
+            foreach (ChatMessage message in messages)
+            {
+                await agentProvider.CreateMessageAsync(conversationId, message, cancellationToken).ConfigureAwait(false);
+            }
+        }
+        return default;
+    }
+}");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+
+void EvaluateStringExpression(StringExpression expression, string targetVariable, bool isNullable = false)
+{
+    string typeName = isNullable ? "string?" : "string";
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(isNullable ? "null" : "string.Empty"));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+        if (expression.LiteralValue.Contains("\n"))
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = \n            \"\"\"\n            ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.LiteralValue));
+
+this.Write("\n            \"\"\";");
+
+ 
+        }
+        else
+        {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+        }
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<string>(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<string>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(typeName));
+
+this.Write(" ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<string>(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+
+void EvaluateValueExpression(ValueExpression expression, string targetVariable) =>
+    EvaluateValueExpression<object>(expression, targetVariable);
+
+void EvaluateValueExpression<TValue>(ValueExpression expression, string targetVariable)
+{
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = null;");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatDataValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CopyConversationMessagesTemplate.tt

@@ -0,0 +1,33 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ import namespace="Microsoft.Extensions.AI" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateStringExpressionTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateValueExpressionTemplate.tt" once="true" #>
+/// <summary>
+/// Copies one or more messages into the specified agent conversation.
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {<#
+        EvaluateStringExpression(this.Model.ConversationId, "conversationId", isNullable: true); #>
+        if (string.IsNullOrWhiteSpace(conversationId))
+        {
+            throw new DeclarativeActionException($"Conversation identifier must be defined: {this.Id}");
+        }<#
+        EvaluateValueExpression<ChatMessage[]>(this.Model.Messages, "messages");
+        #>
+        if (messages is not null)
+        {
+            foreach (ChatMessage message in messages)
+            {
+                await agentProvider.CreateMessageAsync(conversationId, message, cancellationToken).ConfigureAwait(false);
+            }
+        }
+        return default;
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CopyConversationMessagesTemplateCode.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class CopyConversationMessagesTemplate
+{
+    public CopyConversationMessagesTemplate(CopyConversationMessages model)
+    {
+        this.Model = this.Initialize(model);
+        this.UseAgentProvider = true;
+    }
+
+    public CopyConversationMessages Model { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CreateConversationTemplate.cs

@@ -0,0 +1,78 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.ObjectModel;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class CreateConversationTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Creates a new conversation and stores the identifier value to " +
+                    "the \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Model.ConversationId));
+            this.Write("\" variable.\n/// </summary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExe" +
+                    "cutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write(@""", session)
+{
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {
+        string conversationId = await agentProvider.CreateConversationAsync(cancellationToken).ConfigureAwait(false);");
+
+        AssignVariable(this.ConversationId, "conversationId");
+            this.Write("\n        await context.AddEventAsync(new ConversationUpdateEvent(conversationId))" +
+                    ".ConfigureAwait(false);\n\n        return default;\n    }\n}\n");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CreateConversationTemplate.tt

@@ -0,0 +1,19 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+/// <summary>
+/// Creates a new conversation and stores the identifier value to the "<#= this.Model.ConversationId #>" variable.
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session, ResponseAgentProvider agentProvider) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {
+        string conversationId = await agentProvider.CreateConversationAsync(cancellationToken).ConfigureAwait(false);<#
+        AssignVariable(this.ConversationId, "conversationId");#>
+        await context.AddEventAsync(new ConversationUpdateEvent(conversationId)).ConfigureAwait(false);
+
+        return default;
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/CreateConversationTemplateCode.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class CreateConversationTemplate
+{
+    public CreateConversationTemplate(CreateConversation model)
+    {
+        this.Model = this.Initialize(model);
+        this.ConversationId = Throw.IfNull(this.Model.ConversationId);
+        this.UseAgentProvider = true;
+    }
+
+    public CreateConversation Model { get; }
+
+    public PropertyPath ConversationId { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/DefaultTemplate.cs

@@ -0,0 +1,40 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class DefaultTemplate : ActionTemplate, IModeledAction
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\nDelegateExecutor ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.InstanceVariable));
+            this.Write(" = new(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.RootVariable));
+            this.Write(".Session");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Action is not null ? $", {this.Action}" : ""));
+            this.Write(");\n");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/DefaultTemplate.tt

@@ -0,0 +1,4 @@
+<#@ template language="C#" inherits="ActionTemplate, IModeledAction" visibility="internal" linePragmas="false" #>
+<#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Interpreter" #>
+<#@ assembly name="System.Core" #>
+DelegateExecutor <#= this.InstanceVariable #> = new(id: "<#= this.Id #>", <#= this.RootVariable #>.Session<#= this.Action is not null ? $", {this.Action}" : "" #>);

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/DefaultTemplateCode.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class DefaultTemplate
+{
+    public DefaultTemplate(DialogAction model, string rootId, string? action = null)
+    {
+        this.Initialize(model);
+        this.Action = action;
+        this.InstanceVariable = this.Id.FormatName();
+        this.RootVariable = rootId.FormatName();
+    }
+
+    public string? Action { get; }
+    public string InstanceVariable { get; }
+    public string RootVariable { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EdgeTemplate.cs

@@ -0,0 +1,51 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class EdgeTemplate : CodeTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+ if (this.Condition is not null)
+{
+            this.Write("\n    builder.AddEdge(");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.SourceId));
+            this.Write(", ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.TargetId));
+            this.Write(", (object? result) => ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Condition));
+            this.Write(");");
+
+}
+else
+{
+            this.Write("\n    builder.AddEdge(");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.SourceId));
+            this.Write(", ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.TargetId));
+            this.Write(");");
+
+} 
+            this.Write("\n");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EdgeTemplate.tt

@@ -0,0 +1,10 @@
+<#@ template language="C#" inherits="CodeTemplate" visibility="internal" linePragmas="false" #>
+<#@ assembly name="System.Core" #>
+<# if (this.Condition is not null)
+{#>
+    builder.AddEdge(<#= this.SourceId #>, <#= this.TargetId #>, (object? result) => <#= this.Condition #>);<#
+}
+else
+{#>
+    builder.AddEdge(<#= this.SourceId #>, <#= this.TargetId #>);<#
+} #>

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EdgeTemplateCode.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class EdgeTemplate
+{
+    public EdgeTemplate(string sourceId, string targetId, string? condition = null)
+    {
+        this.SourceId = sourceId.FormatName();
+        this.TargetId = targetId.FormatName();
+        this.Condition = condition;
+    }
+
+    public string SourceId { get; }
+    public string TargetId { get; }
+    public string? Condition { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EditTableV2Template.cs

@@ -0,0 +1,37 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class EditTableV2Template : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Modify items in a list\n/// </summary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session) : ActionExecutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", session)\n{\n    // <inheritdoc />\n    protected override async ValueTask<object" +
+                    "?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)\n " +
+                    "   {\n        return default;\n    }\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EditTableV2Template.tt

@@ -0,0 +1,14 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+/// <summary>
+/// Modify items in a list
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {
+        return default;
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EditTableV2TemplateCode.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.ObjectModel;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class EditTableV2Template
+{
+    public EditTableV2Template(EditTableV2 model)
+    {
+        this.Model = this.Initialize(model);
+    }
+
+    public EditTableV2 Model { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EmptyTemplate.cs

@@ -0,0 +1,40 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class EmptyTemplate : CodeTemplate, IModeledAction
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\nDelegateExecutor ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.InstanceVariable));
+            this.Write(" = new(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write("\", ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.RootVariable));
+            this.Write(".Session");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Action is not null ? $", {this.Action}" : ""));
+            this.Write(");\n");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EmptyTemplate.tt

@@ -0,0 +1,4 @@
+<#@ template language="C#" inherits="CodeTemplate, IModeledAction" visibility="internal" linePragmas="false" #>
+<#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Interpreter" #>
+<#@ assembly name="System.Core" #>
+DelegateExecutor <#= this.InstanceVariable #> = new(id: "<#= this.Id #>", <#= this.RootVariable #>.Session<#= this.Action is not null ? $", {this.Action}" : "" #>);

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/EmptyTemplateCode.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class EmptyTemplate
+{
+    public EmptyTemplate(string actionId, string rootId, string? action = null)
+    {
+        this.Id = actionId;
+        this.Name = this.Id.FormatType();
+        this.InstanceVariable = this.Id.FormatName();
+        this.RootVariable = rootId.FormatName();
+        this.Action = action;
+    }
+
+    public string Id { get; }
+    public string Name { get; }
+    public string InstanceVariable { get; }
+    public string RootVariable { get; }
+    public string? Action { get; }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ForeachTemplate.cs

@@ -0,0 +1,250 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version: 18.0.0.0
+//  
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
+{
+    using Microsoft.Agents.ObjectModel;
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
+    internal partial class ForeachTemplate : ActionTemplate
+    {
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public override string TransformText()
+        {
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n");
+            this.Write("\n/// <summary>\n/// Loops over a list assignign the loop variable to \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Model.Value));
+            this.Write("\" variable.\n/// </summary>\ninternal sealed class ");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Name));
+            this.Write("Executor(FormulaSession session) : ActionExecutor(id: \"");
+            this.Write(this.ToStringHelper.ToStringWithCulture(this.Id));
+            this.Write(@""", session)
+{
+    private int _index;
+    private object[] _values = [];
+
+    public bool HasValue { get; private set; }
+
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {
+        this._index = 0;");
+
+
+        EvaluateValueExpression(this.Model.Items, "evaluatedValue");
+            this.Write(@"
+
+        if (evaluatedValue == null)
+        {
+            this._values = [];
+            this.HasValue = false;
+        }
+        else
+        if (evaluatedValue is IEnumerable evaluatedList)
+        {
+            this._values = [.. evaluatedList];
+        }
+        else
+        {
+            this._values = [evaluatedValue];
+        }
+
+        await this.ResetAsync(context, cancellationToken).ConfigureAwait(false);
+
+        return default;
+    }
+
+    public async ValueTask TakeNextAsync(IWorkflowContext context, object? _, CancellationToken cancellationToken)
+    {
+        if (this.HasValue = this._index < this._values.Length)
+        {
+            object value = this._values[this._index];
+            ");
+ 
+            AssignVariable(this.Value, "value", tightFormat: true);
+
+            if (this.Index is not null)
+            {
+                AssignVariable(this.Index, "this._index", tightFormat: true);
+            }
+            
+            this.Write(@"
+
+            this._index++;
+        }
+    }
+
+    public async ValueTask CompleteAsync(IWorkflowContext context, object? _, CancellationToken cancellationToken)
+    {
+        await this.ResetAsync(context, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async ValueTask ResetAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {");
+ 
+        AssignVariable(this.Value, "UnassignedValue.Instance", tightFormat: true);
+
+        if (this.Index is not null)
+        {
+            AssignVariable(this.Index, "UnassignedValue.Instance", tightFormat: true);
+        }
+      
+            this.Write("\n    }\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+
+void AssignVariable(PropertyPath targetVariable, string valueVariable, bool tightFormat = false)
+{
+    if (targetVariable is not null)
+    {
+this.Write("\n        await context.QueueStateUpdateAsync(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableName(targetVariable)));
+
+this.Write("\", value: ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(valueVariable));
+
+this.Write(", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(VariableScope(targetVariable)));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+        if (!tightFormat)
+        {
+this.Write("\n        ");
+
+}
+    }
+}
+
+
+void EvaluateValueExpression(ValueExpression expression, string targetVariable) =>
+    EvaluateValueExpression<object>(expression, targetVariable);
+
+void EvaluateValueExpression<TValue>(ValueExpression expression, string targetVariable)
+{
+    if (expression is null)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = null;");
+
+ 
+    }
+    else if (expression.IsLiteral)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatDataValue(expression.LiteralValue)));
+
+this.Write(";");
+
+ 
+    }
+    else if (expression.IsVariableReference && expression.VariableReference.SegmentCount == 2)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.ReadStateAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(key: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.VariableName));
+
+this.Write("\", scopeName: \"");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(expression.VariableReference.NamespaceAlias));
+
+this.Write("\").ConfigureAwait(false);");
+
+
+    }
+    else if (expression.IsVariableReference)
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.VariableReference.ToString())));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+    else
+    {
+this.Write("\n        ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write("? ");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(targetVariable));
+
+this.Write(" = await context.EvaluateValueAsync<");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(GetTypeAlias<TValue>()));
+
+this.Write(">(");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(FormatStringValue(expression.ExpressionText)));
+
+this.Write(").ConfigureAwait(false);");
+
+ 
+    }
+}
+
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ForeachTemplate.tt

@@ -0,0 +1,77 @@
+<#@ template language="C#" inherits="ActionTemplate" visibility="internal" linePragmas="false" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
+<#@ include file="Snippets/AssignVariableTemplate.tt" once="true" #>
+<#@ include file="Snippets/EvaluateValueExpressionTemplate.tt" once="true" #>
+/// <summary>
+/// Loops over a list assignign the loop variable to "<#= this.Model.Value #>" variable.
+/// </summary>
+internal sealed class <#= this.Name #>Executor(FormulaSession session) : ActionExecutor(id: "<#= this.Id #>", session)
+{
+    private int _index;
+    private object[] _values = [];
+
+    public bool HasValue { get; private set; }
+
+    // <inheritdoc />
+    protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {
+        this._index = 0;<#
+
+        EvaluateValueExpression(this.Model.Items, "evaluatedValue");#>
+
+        if (evaluatedValue == null)
+        {
+            this._values = [];
+            this.HasValue = false;
+        }
+        else
+        if (evaluatedValue is IEnumerable evaluatedList)
+        {
+            this._values = [.. evaluatedList];
+        }
+        else
+        {
+            this._values = [evaluatedValue];
+        }
+
+        await this.ResetAsync(context, cancellationToken).ConfigureAwait(false);
+
+        return default;
+    }
+
+    public async ValueTask TakeNextAsync(IWorkflowContext context, object? _, CancellationToken cancellationToken)
+    {
+        if (this.HasValue = this._index < this._values.Length)
+        {
+            object value = this._values[this._index];
+            <# 
+            AssignVariable(this.Value, "value", tightFormat: true);
+
+            if (this.Index is not null)
+            {
+                AssignVariable(this.Index, "this._index", tightFormat: true);
+            }
+            #>
+
+            this._index++;
+        }
+    }
+
+    public async ValueTask CompleteAsync(IWorkflowContext context, object? _, CancellationToken cancellationToken)
+    {
+        await this.ResetAsync(context, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async ValueTask ResetAsync(IWorkflowContext context, CancellationToken cancellationToken)
+    {<# 
+        AssignVariable(this.Value, "UnassignedValue.Instance", tightFormat: true);
+
+        if (this.Index is not null)
+        {
+            AssignVariable(this.Index, "UnassignedValue.Instance", tightFormat: true);
+        }
+      #>
+    }
+}

dotnet/src/Microsoft.Agents.AI.Workflows.Declarative/CodeGen/ForeachTemplateCode.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Shared.Diagnostics;
+
+namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
+
+internal partial class ForeachTemplate
+{
+    public ForeachTemplate(Foreach model)
+    {
+        this.Model = this.Initialize(model);
+        this.Index = this.Model.Index?.Path;
+        this.Value = Throw.IfNull(this.Model.Value);
+    }
+
+    public Foreach Model { get; }
+    public PropertyPath? Index { get; }
+    public PropertyPath Value { get; }
+}