dotnet · mattleibow · May 5, 2026 · May 5, 2026 · May 5, 2026 · May 6, 2026
diff --git a/.github/workflows/ci-ai.yml b/.github/workflows/ci-ai.yml
@@ -0,0 +1,36 @@
+name: CI - AI Extensions
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'src/AIExtensions/**'
+      - 'tests/AIExtensions/**'
+      - 'eng/**'
+      - 'Directory.Build.props'
+      - 'Directory.Build.targets'
+      - 'Directory.Packages.props'
+      - 'global.json'
+      - 'NuGet.config'
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+    branches: [main]
+    paths:
+      - 'src/AIExtensions/**'
+      - 'tests/AIExtensions/**'
+      - 'eng/**'
+      - 'Directory.Build.props'
+      - 'Directory.Build.targets'
+      - 'Directory.Packages.props'
+      - 'global.json'
+      - 'NuGet.config'
+
+jobs:
+  build:
+    uses: ./.github/workflows/_build.yml
+    with:
+      project-path: src/AIExtensions/AIExtensions.slnf
+      project-name: ai-extensions
+      run-tests: true
+      pack: true
+      install-workloads: false
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,6 +11,7 @@
     <PackageProjectUrl>https://github.com/dotnet/maui-labs</PackageProjectUrl>
     <RepositoryUrl>https://github.com/dotnet/maui-labs</RepositoryUrl>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <ValidateXcodeVersion>false</ValidateXcodeVersion>
     <!-- Allow restoring/building Windows TFMs on non-Windows hosts (macOS CI runners) -->
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <!-- NU1507: official builds inject internal feeds via SetupNugetSources that aren't in packageSourceMapping -->

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -24,14 +24,28 @@
     <PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsVersion)" />
+  </ItemGroup>
+
+  <!-- AI (Microsoft.Extensions.AI + Azure OpenAI) -->
+  <ItemGroup Label="AI">
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIOpenAIVersion)" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="$(AzureAIOpenAIVersion)" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitMvvmVersion)" />
+  </ItemGroup>
+
+  <!-- Roslyn (for source generators) -->
+  <ItemGroup Label="Roslyn">
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
   </ItemGroup>
 
   <!-- DevFlow dependencies (pinned, third party) -->
   <ItemGroup Label="DevFlow">
     <PackageVersion Include="Fizzler" Version="$(FizzlerVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
     <PackageVersion Include="Spectre.Console" Version="$(SpectreConsoleVersion)" />
@@ -63,17 +77,14 @@
   <!-- EssentialsAI dependencies -->
   <ItemGroup Label="EssentialsAI">
     <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIAbstractionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
     <!-- Sample app: Microsoft Agents AI -->
     <PackageVersion Include="Microsoft.Agents.AI" Version="$(MicrosoftAgentsAIVersion)" />
     <PackageVersion Include="Microsoft.Agents.AI.Hosting" Version="$(MicrosoftAgentsAIHostingVersion)" />
     <PackageVersion Include="Microsoft.Agents.AI.Workflows" Version="$(MicrosoftAgentsAIWorkflowsVersion)" />
     <PackageVersion Include="Microsoft.Agents.AI.Workflows.Generators" Version="$(MicrosoftAgentsAIWorkflowsGeneratorsVersion)" />
     <!-- Sample app: additional packages (pinned) -->
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Markdig" Version="0.31.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25560.10" />
-    <PackageVersion Include="OpenAI" Version="2.6.0" />
+    <PackageVersion Include="OpenAI" Version="2.9.1" />
     <!-- Unit tests -->
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <!-- Benchmarks -->
@@ -93,6 +104,8 @@
     <PackageVersion Include="xunit" Version="$(XunitVersion)" />
     <PackageVersion Include="xunit.runner.utility" Version="$(XunitVersion)" />
     <PackageVersion Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
+    <PackageVersion Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />
+    <PackageVersion Include="Verify.SourceGenerators" Version="$(VerifySourceGeneratorsVersion)" />
     <PackageVersion Include="Microsoft.OpenApi" Version="$(MicrosoftOpenApiVersion)" />
     <PackageVersion Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />

diff --git a/MauiLabs.slnx b/MauiLabs.slnx
@@ -8,6 +8,9 @@
     <Project Path="playground/DevFlow.Console/DevFlow.Console.csproj" />
   </Folder>
   <Folder Name="/samples/">
+    <Project Path="samples/AIExtensions.Sample.Garden/AIExtensions.Sample.Garden.csproj" />
+    <Project Path="samples/AIExtensions.Sample.Hello/AIExtensions.Sample.Hello.csproj" />
+    <Project Path="samples/AIExtensions.Sample.DIParameters/AIExtensions.Sample.DIParameters.csproj" />
     <Project Path="samples/DevFlow.Sample.Linux/DevFlow.Sample.Linux.csproj" />
     <Project Path="samples/DevFlow.Sample.MacOS/DevFlow.Sample.MacOS.csproj" />
     <Project Path="samples/DevFlow.Sample/DevFlow.Sample.csproj" />
@@ -17,6 +20,15 @@
   <Folder Name="/src/AI/">
     <Project Path="src/AI/Microsoft.Maui.Essentials.AI/Microsoft.Maui.Essentials.AI.csproj" />
   </Folder>
+  <Folder Name="/src/AIExtensions/">
+    <Project Path="src/AIExtensions/Microsoft.Maui.AI.Attributes/Microsoft.Maui.AI.Attributes.csproj" />
+    <Project Path="src/AIExtensions/Microsoft.Maui.AI.Attributes.Generators/Microsoft.Maui.AI.Attributes.Generators.csproj" />
+    <Project Path="src/AIExtensions/Microsoft.Maui.AI.Indexer/Microsoft.Maui.AI.Indexer.csproj" />
+    <Project Path="src/AIExtensions/Microsoft.Maui.AI.Indexer.Generators/Microsoft.Maui.AI.Indexer.Generators.csproj" />
+    <Project Path="tests/AIExtensions/Microsoft.Maui.AI.Attributes.Tests/Microsoft.Maui.AI.Attributes.Tests.csproj" />
+    <Project Path="tests/AIExtensions/Microsoft.Maui.AI.Attributes.Generators.Tests/Microsoft.Maui.AI.Attributes.Generators.Tests.csproj" />
+    <Project Path="tests/AIExtensions/Microsoft.Maui.AI.Indexer.Tests/Microsoft.Maui.AI.Indexer.Tests.csproj" />
+  </Folder>
   <Folder Name="/src/Comet/">
     <Project Path="src/Comet/src/Comet.SourceGenerator/Comet.SourceGenerator.csproj" />
     <Project Path="src/Comet/src/Comet/Comet.csproj" />

diff --git a/README.md b/README.md
@@ -71,6 +71,18 @@ A comprehensive MAUI testing, automation, and debugging toolkit. The DevFlow CLI
 | `Microsoft.Maui.DevFlow.Driver` | Platform driver library |
 | `Microsoft.Maui.DevFlow.Logging` | Buffered JSONL file logger |
 
+### AI Extensions
+
+AI integration packages for `Microsoft.Extensions.AI` and .NET MAUI apps.
+
+#### AI Attributes
+
+Source-generated AI tool discovery — annotate methods or property accessors with `[ExportAIFunction]` to create AI-callable tools. Composed or auto-generated tool contexts, DI-aware parameter binding, approval gates, AOT-friendly.
+
+| Package | Description |
+|---------|-------------|
+| `Microsoft.Maui.AI.Attributes` | Source-generated AI tool contexts for `Microsoft.Extensions.AI` |
+
 ### macOS AppKit Backend
 
 A native macOS AppKit backend for .NET MAUI — run MAUI apps as true AppKit apps with NSWindow, NSButton, NSScrollView, native menu bar, sidebar flyout, and more. An alternative to Mac Catalyst.
@@ -168,6 +180,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for build instructions and development se
 
 For the formal DevFlow HTTP and WebSocket contract, see [`docs/DevFlow/spec`](docs/DevFlow/spec/README.md).
 
+For AI Extensions usage and samples, see [`src/AIExtensions/README.md`](src/AIExtensions/README.md) and [`samples/AIExtensions.Sample.Garden`](samples/AIExtensions.Sample.Garden/README.md).
+
 ## Support
 
 See [SUPPORT.md](.github/SUPPORT.md) for how to file issues, get help, and the support policy for this repository.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -29,15 +29,26 @@
     <MicrosoftExtensionsHttpVersion>10.0.5</MicrosoftExtensionsHttpVersion>
     <MicrosoftExtensionsHostingVersion>10.0.5</MicrosoftExtensionsHostingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>10.0.5</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>10.0.5</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftExtensionsLoggingVersion>10.0.5</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingDebugVersion>10.0.5</MicrosoftExtensionsLoggingDebugVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>10.0.5</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsVersion>10.0.5</MicrosoftExtensionsConfigurationUserSecretsVersion>
     <SystemTextJsonVersion>10.0.5</SystemTextJsonVersion>
   </PropertyGroup>
+  <PropertyGroup Label="AI">
+    <MicrosoftExtensionsAIVersion>10.4.1</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIOpenAIVersion>10.4.1</MicrosoftExtensionsAIOpenAIVersion>
+    <AzureAIOpenAIVersion>2.1.0</AzureAIOpenAIVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="Roslyn">
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersVersion>
+  </PropertyGroup>
   <!-- Pinned dependencies (third party, not flowing via maestro) -->
   <PropertyGroup Label="Third Party">
     <AathifMahirMauiIconsCupertinoVersion>5.0.0</AathifMahirMauiIconsCupertinoVersion>
+    <CommunityToolkitMvvmVersion>8.4.2</CommunityToolkitMvvmVersion>
     <FizzlerVersion>1.3.1</FizzlerVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.12.0</MicrosoftCodeAnalysisCSharpVersion>
     <SkiaSharpVersion>3.119.2</SkiaSharpVersion>
     <SpectreConsoleVersion>0.54.0</SpectreConsoleVersion>
     <SystemCommandLineStableVersion>2.0.5</SystemCommandLineStableVersion>
@@ -71,8 +82,7 @@
   <PropertyGroup Label="EssentialsAI">
     <EssentialsAIPreviewVersionIteration>1</EssentialsAIPreviewVersionIteration>
     <!-- Microsoft Extensions AI -->
-    <MicrosoftExtensionsAIVersion>10.3.0</MicrosoftExtensionsAIVersion>
-    <MicrosoftExtensionsAIAbstractionsVersion>10.3.0</MicrosoftExtensionsAIAbstractionsVersion>
+    <MicrosoftExtensionsAIAbstractionsVersion>10.4.1</MicrosoftExtensionsAIAbstractionsVersion>
     <!-- Microsoft Agents AI (sample only) -->
     <MicrosoftAgentsAIVersion>1.0.0-rc2</MicrosoftAgentsAIVersion>
     <MicrosoftAgentsAIWorkflowsVersion>1.0.0-rc2</MicrosoftAgentsAIWorkflowsVersion>
@@ -86,6 +96,8 @@
     <XunitVersion>2.9.3</XunitVersion>
     <XunitRunnerVisualstudioVersion>3.1.5</XunitRunnerVisualstudioVersion>
     <CoverletCollectorVersion>8.0.0</CoverletCollectorVersion>
+    <VerifyXunitVersion>28.15.0</VerifyXunitVersion>
+    <VerifySourceGeneratorsVersion>2.5.0</VerifySourceGeneratorsVersion>
   </PropertyGroup>
   <PropertyGroup Label="SourceLink">
     <MicrosoftSourceLinkGitHubVersion>10.0.201</MicrosoftSourceLinkGitHubVersion>

diff --git a/eng/pipelines/devflow-official.yml b/eng/pipelines/devflow-official.yml
@@ -36,6 +36,10 @@ parameters:
   displayName: 'Publish macOS AppKit packages to NuGet.org'
   type: boolean
   default: false
+- name: publishAIExtensionsNuget
+  displayName: 'Publish AI Extensions packages to NuGet.org'
+  type: boolean
+  default: false
 - name: publishEssentialsAINuget
   displayName: 'Publish EssentialsAI packages to NuGet.org'
   type: boolean
@@ -141,6 +145,30 @@ extends:
                 $(_OfficialBuildArgs)
               displayName: Build and Test Cli
 
+          - job: AI
+            displayName: AI Extensions - Windows
+            pool:
+              name: NetCore1ESPool-Internal
+              demands: ImageOverride -equals windows.vs2026preview.scout.amd64
+            strategy:
+              matrix:
+                Release:
+                  _BuildConfig: Release
+                  _OfficialBuildArgs: /p:DotNetSignType=$(_SignType)
+                    /p:TeamName=$(_TeamName)
+                    /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+            steps:
+            - task: UseDotNet@2
+              displayName: Install .NET SDK
+              inputs:
+                version: 10.0.105
+            - script: eng\common\cibuild.cmd
+                -configuration $(_BuildConfig)
+                -prepareMachine
+                -projects $(Build.SourcesDirectory)\src\AIExtensions\AIExtensions.slnf
+                $(_OfficialBuildArgs)
+              displayName: Build and Test AI Extensions
+
           - job: AppProjectReference
             displayName: AppProjectReference - Windows
             pool:
@@ -587,6 +615,61 @@ extends:
               nuGetFeedType: external
               publishFeedCredentials: 'nuget.org (dotnetframework)'
 
+    # Publish AI Extensions packages to NuGet.org
+    - ${{ if eq(parameters.publishAIExtensionsNuget, true) }}:
+      - stage: publish_ai_extensions_nuget
+        displayName: 'Publish AI Extensions to NuGet.org'
+        dependsOn:
+        - Validate
+        - publish_using_darc
+        jobs:
+        - job: PrepareArtifacts
+          displayName: 'Prepare AI Artifacts'
+          timeoutInMinutes: 15
+          pool:
+            name: NetCore1ESPool-Internal
+            image: windows.vs2026preview.scout.amd64
+            os: windows
+          templateContext:
+            outputs:
+            - output: pipelineArtifact
+              displayName: Publish AI Packages
+              targetPath: '$(Pipeline.Workspace)/AIPackages'
+              artifactName: AIPackagesForNuGet
+          steps:
+          - download: current
+            artifact: PackageArtifacts
+            displayName: Download PackageArtifacts
+          - powershell: |
+              New-Item -ItemType Directory -Force -Path '$(Pipeline.Workspace)/AIPackages'
+              Copy-Item '$(Pipeline.Workspace)/PackageArtifacts/Microsoft.Maui.AI.*.nupkg' '$(Pipeline.Workspace)/AIPackages/' -Verbose
+            displayName: Filter AI packages
+
+        - job: PublishNuGet
+          displayName: 'Push AI to NuGet.org'
+          dependsOn: PrepareArtifacts
+          timeoutInMinutes: 30
+          pool:
+            name: NetCore1ESPool-Internal
+            image: windows.vs2026preview.scout.amd64
+            os: windows
+          templateContext:
+            type: releaseJob
+            isProduction: true
+            inputs:
+            - input: pipelineArtifact
+              artifactName: AIPackagesForNuGet
+              targetPath: '$(Pipeline.Workspace)/AIPackages'
+          steps:
+          - task: 1ES.PublishNuget@1
+            displayName: 'Push AI to NuGet.org'
+            inputs:
+              useDotNetTask: false
+              packagesToPush: '$(Pipeline.Workspace)/AIPackages/*.nupkg'
+              packageParentPath: '$(Pipeline.Workspace)/AIPackages'
+              nuGetFeedType: external
+              publishFeedCredentials: 'nuget.org (dotnetframework)'
+
     # Publish WPF packages to NuGet.org
     - ${{ if eq(parameters.publishWpfNuget, true) }}:
       - stage: publish_wpf_nuget

diff --git a/samples/AIExtensions.Sample.DIParameters/AIExtensions.Sample.DIParameters.csproj b/samples/AIExtensions.Sample.DIParameters/AIExtensions.Sample.DIParameters.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <RootNamespace>AIExtensions.Sample.DIParameters</RootNamespace>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>ai-attributes-secrets</UserSecretsId>
+
+    <!-- For inspecting source-generator output only. Not required to run the sample. -->
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Azure.AI.OpenAI" />
+    <PackageReference Include="Microsoft.Extensions.AI" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\AIExtensions\Microsoft.Maui.AI.Attributes\Microsoft.Maui.AI.Attributes.csproj" />
+    <ProjectReference Include="..\..\src\AIExtensions\Microsoft.Maui.AI.Attributes.Generators\Microsoft.Maui.AI.Attributes.Generators.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AIExtensions.Sample.DIParameters/ModelProviders.cs b/samples/AIExtensions.Sample.DIParameters/ModelProviders.cs
@@ -0,0 +1,20 @@
+namespace AIExtensions.Sample.DIParameters;
+
+/// <summary>
+/// A keyed service. Pulled from DI using <c>[FromKeyedServices("premium")]</c>
+/// or <c>[FromKeyedServices("free")]</c>.
+/// </summary>
+public interface IModelProvider
+{
+    string Name { get; }
+}
+
+public sealed class FreeModelProvider : IModelProvider
+{
+    public string Name => "free-v1";
+}
+
+public sealed class PremiumModelProvider : IModelProvider
+{
+    public string Name => "premium-v2";
+}