chore: consolidate tests and align CI/docs for M.E.AI

KSemenenko · KSemenenko · commit b217cef38e68 · 2026-03-05T20:19:00.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,5 +44,8 @@ jobs:
       - name: Build
         run: dotnet build ManagedCode.CodexSharpSDK.slnx -c Release -warnaserror --no-restore
 
+      - name: Test (full solution)
+        run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx -c Release --no-build
+
       - name: Smoke tests (Codex CLI discover + invoke)
-        run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx -c Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
+        run: dotnet test --project CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj -c Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
diff --git a/.github/workflows/real-integration.yml b/.github/workflows/real-integration.yml
@@ -46,5 +46,8 @@ jobs:
       - name: Build
         run: dotnet build ManagedCode.CodexSharpSDK.slnx -c Release -warnaserror --no-restore
 
+      - name: Test (full solution)
+        run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx -c Release --no-build
+
       - name: Smoke tests (Codex CLI discover + invoke)
-        run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx -c Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
+        run: dotnet test --project CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj -c Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,8 +61,11 @@ jobs:
     - name: Build
       run: dotnet build ManagedCode.CodexSharpSDK.slnx --configuration Release --warnaserror --no-restore
 
+    - name: Test (full solution)
+      run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx --configuration Release --no-build
+
     - name: Codex CLI smoke tests
-      run: dotnet test --solution ManagedCode.CodexSharpSDK.slnx --configuration Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
+      run: dotnet test --project CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj --configuration Release --no-build -- --treenode-filter "/*/*/*/CodexCli_Smoke_*"
 
     - name: Pack NuGet package
       run: dotnet pack CodexSharpSDK/CodexSharpSDK.csproj --configuration Release --no-build -p:IncludeSymbols=false -p:SymbolPackageFormat=snupkg --output ./artifacts
diff --git a/AGENTS.md b/AGENTS.md
@@ -123,6 +123,7 @@ If no new rule is detected -> do not update the file.
 - For CLI process interaction tests, use the real installed `codex` CLI (no `FakeCodexProcessRunner` test doubles).
 - Treat `codex` CLI as a test prerequisite: ensure local/CI test setup installs `codex` before running CLI interaction tests; do not replace this with fakes.
 - CI must validate SDK on all Codex-supported desktop/server platforms (macOS, Linux, Windows): run build + tests and include a non-auth smoke check that `codex` is discoverable and invokable.
+- CI/release workflow smoke checks are additive gates; they must not replace full `dotnet test --solution ManagedCode.CodexSharpSDK.slnx -c Release` execution.
 - Cross-platform non-auth smoke must run `codex` from local installation in CI and verify unauthenticated behavior explicitly (for example `codex login status` in isolated profile returns "Not logged in"), proving binary discovery + process launch on each platform.
 - Real Codex integration tests must rely on existing local Codex CLI login/session only; do not read or require `OPENAI_API_KEY` in test setup.
 - Do not use nullable `TryGetSettings()` + early `return` skip patterns in real integration tests; resolve required settings directly and fail fast with actionable errors when missing.
diff --git a/CodexSharpSDK.Extensions.AI.Tests/CodexSharpSDK.Extensions.AI.Tests.csproj b/CodexSharpSDK.Extensions.AI.Tests/CodexSharpSDK.Extensions.AI.Tests.csproj
diff --git a/CodexSharpSDK.Extensions.AI/CodexChatClientOptions.cs b/CodexSharpSDK.Extensions.AI/CodexChatClientOptions.cs
@@ -5,7 +5,7 @@ namespace ManagedCode.CodexSharpSDK.Extensions.AI;
 
 public sealed record CodexChatClientOptions
 {
-    public CodexOptions? CodexOptions { get; init; }
-    public string? DefaultModel { get; init; }
-    public ThreadOptions? DefaultThreadOptions { get; init; }
+    public CodexOptions? CodexOptions { get; set; }
+    public string? DefaultModel { get; set; }
+    public ThreadOptions? DefaultThreadOptions { get; set; }
 }
diff --git a/CodexSharpSDK.Extensions.AI/Internal/ChatMessageMapper.cs b/CodexSharpSDK.Extensions.AI/Internal/ChatMessageMapper.cs
@@ -1,15 +1,18 @@
-using System.Text;
 using ManagedCode.CodexSharpSDK.Models;
 using Microsoft.Extensions.AI;
 
 namespace ManagedCode.CodexSharpSDK.Extensions.AI.Internal;
 
 internal static class ChatMessageMapper
 {
+    private const string SystemPrefix = "[System] ";
+    private const string AssistantPrefix = "[Assistant] ";
+    private const string ParagraphSeparator = "\n\n";
+    private const string ImageMediaPrefix = "image/";
+
     internal static (string Prompt, List<DataContent> ImageContents) ToCodexInput(IEnumerable<ChatMessage> messages)
     {
-        var prompt = new StringBuilder();
-        var userTextParts = new List<string>();
+        var promptParts = new List<string>();
         var imageContents = new List<DataContent>();
 
         foreach (var message in messages)
@@ -18,38 +21,42 @@ internal static (string Prompt, List<DataContent> ImageContents) ToCodexInput(IE
             {
                 if (message.Text is { } systemText)
                 {
-                    prompt.Append("[System] ").Append(systemText).Append("\n\n");
+                    promptParts.Add(string.Concat(SystemPrefix, systemText));
                 }
+
+                continue;
             }
-            else if (message.Role == ChatRole.User)
+
+            if (message.Role == ChatRole.User)
             {
+                var userTextParts = new List<string>();
                 foreach (var content in message.Contents)
                 {
-                    if (content is TextContent tc && tc.Text is not null)
+                    if (content is TextContent textContent && textContent.Text is { } text)
                     {
-                        userTextParts.Add(tc.Text);
+                        userTextParts.Add(text);
                     }
-                    else if (content is DataContent dc && dc.MediaType is not null && dc.MediaType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+                    else if (content is DataContent dataContent && IsImageMediaType(dataContent.MediaType))
                     {
-                        imageContents.Add(dc);
+                        imageContents.Add(dataContent);
                     }
                 }
-            }
-            else if (message.Role == ChatRole.Assistant)
-            {
-                if (message.Text is { } assistantText)
+
+                if (userTextParts.Count > 0)
                 {
-                    prompt.Append("[Assistant] ").Append(assistantText).Append("\n\n");
+                    promptParts.Add(string.Join(ParagraphSeparator, userTextParts));
                 }
+
+                continue;
             }
-        }
 
-        if (userTextParts.Count > 0)
-        {
-            prompt.Append(string.Join("\n\n", userTextParts));
+            if (message.Role == ChatRole.Assistant && message.Text is { } assistantText)
+            {
+                promptParts.Add(string.Concat(AssistantPrefix, assistantText));
+            }
         }
 
-        return (prompt.ToString(), imageContents);
+        return (string.Join(ParagraphSeparator, promptParts), imageContents);
     }
 
     internal static IReadOnlyList<UserInput> BuildUserInput(string prompt, IReadOnlyList<DataContent> imageContents)
@@ -74,6 +81,9 @@ internal static IReadOnlyList<UserInput> BuildUserInput(string prompt, IReadOnly
         return inputs;
     }
 
+    private static bool IsImageMediaType(string? mediaType) =>
+        mediaType is not null && mediaType.StartsWith(ImageMediaPrefix, StringComparison.OrdinalIgnoreCase);
+
     private static string GenerateFileName(string? mediaType)
     {
         var extension = mediaType switch
diff --git a/CodexSharpSDK.Extensions.AI/Properties/AssemblyInfo.cs b/CodexSharpSDK.Extensions.AI/Properties/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("ManagedCode.CodexSharpSDK.Extensions.AI.Tests")]
+[assembly: InternalsVisibleTo("ManagedCode.CodexSharpSDK.Tests")]
diff --git a/CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj b/CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj
@@ -16,9 +16,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../CodexSharpSDK/CodexSharpSDK.csproj" />
+    <ProjectReference Include="..\CodexSharpSDK.Extensions.AI\CodexSharpSDK.Extensions.AI.csproj" />
+    <ProjectReference Include="..\CodexSharpSDK\CodexSharpSDK.csproj" />
   </ItemGroup>
 </Project>
diff --git a/CodexSharpSDK.Tests/MEAI/ChatMessageMapperTests.cs b/CodexSharpSDK.Tests/MEAI/ChatMessageMapperTests.cs
@@ -42,6 +42,23 @@ public async Task ToCodexInput_AssistantMessage_AppendsAssistantPrefix()
         await Assert.That(prompt).Contains("Follow up");
     }
 
+    [Test]
+    public async Task ToCodexInput_MixedRoles_PreservesMessageChronology()
+    {
+        var messages = new[]
+        {
+            new ChatMessage(ChatRole.System, "Be concise"),
+            new ChatMessage(ChatRole.User, "First question"),
+            new ChatMessage(ChatRole.Assistant, "First answer"),
+            new ChatMessage(ChatRole.User, "Follow up"),
+        };
+
+        var (prompt, _) = ChatMessageMapper.ToCodexInput(messages);
+
+        await Assert.That(prompt).IsEqualTo(
+            "[System] Be concise\n\nFirst question\n\n[Assistant] First answer\n\nFollow up");
+    }
+
     [Test]
     public async Task ToCodexInput_ImageContent_ExtractedSeparately()
     {
diff --git a/CodexSharpSDK.Tests/MEAI/ChatOptionsMapperTests.cs b/CodexSharpSDK.Tests/MEAI/ChatOptionsMapperTests.cs
diff --git a/CodexSharpSDK.Tests/MEAI/ChatResponseMapperTests.cs b/CodexSharpSDK.Tests/MEAI/ChatResponseMapperTests.cs
diff --git a/CodexSharpSDK.Tests/MEAI/CodexServiceCollectionExtensionsTests.cs b/CodexSharpSDK.Tests/MEAI/CodexServiceCollectionExtensionsTests.cs
@@ -6,6 +6,8 @@ namespace ManagedCode.CodexSharpSDK.Extensions.AI.Tests;
 
 public class CodexServiceCollectionExtensionsTests
 {
+    private const string ConfiguredDefaultModel = "configured-default-model";
+
     [Test]
     public async Task AddCodexChatClient_RegistersIChatClient()
     {
@@ -21,10 +23,14 @@ public async Task AddCodexChatClient_RegistersIChatClient()
     public async Task AddCodexChatClient_WithConfiguration_RegistersIChatClient()
     {
         var services = new ServiceCollection();
-        services.AddCodexChatClient(_ => { });
+        services.AddCodexChatClient(options => options.DefaultModel = ConfiguredDefaultModel);
         var provider = services.BuildServiceProvider();
         var client = provider.GetService<IChatClient>();
         await Assert.That(client).IsNotNull();
+
+        var metadata = client!.GetService(typeof(ChatClientMetadata)) as ChatClientMetadata;
+        await Assert.That(metadata).IsNotNull();
+        await Assert.That(metadata!.DefaultModelId).IsEqualTo(ConfiguredDefaultModel);
     }
 
     [Test]
@@ -36,4 +42,19 @@ public async Task AddKeyedCodexChatClient_RegistersWithKey()
         var client = provider.GetKeyedService<IChatClient>("codex");
         await Assert.That(client).IsNotNull();
     }
+
+    [Test]
+    public async Task AddKeyedCodexChatClient_WithConfiguration_AppliesConfiguredDefaultModel()
+    {
+        var services = new ServiceCollection();
+        services.AddKeyedCodexChatClient("codex", options => options.DefaultModel = ConfiguredDefaultModel);
+        var provider = services.BuildServiceProvider();
+        var client = provider.GetKeyedService<IChatClient>("codex");
+
+        await Assert.That(client).IsNotNull();
+
+        var metadata = client!.GetService(typeof(ChatClientMetadata)) as ChatClientMetadata;
+        await Assert.That(metadata).IsNotNull();
+        await Assert.That(metadata!.DefaultModelId).IsEqualTo(ConfiguredDefaultModel);
+    }
 }
diff --git a/CodexSharpSDK.Tests/MEAI/StreamingEventMapperTests.cs b/CodexSharpSDK.Tests/MEAI/StreamingEventMapperTests.cs
diff --git a/ManagedCode.CodexSharpSDK.slnx b/ManagedCode.CodexSharpSDK.slnx
@@ -2,5 +2,4 @@
   <Project Path="CodexSharpSDK/CodexSharpSDK.csproj" />
   <Project Path="CodexSharpSDK.Extensions.AI/CodexSharpSDK.Extensions.AI.csproj" />
   <Project Path="CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj" />
-  <Project Path="CodexSharpSDK.Extensions.AI.Tests/CodexSharpSDK.Extensions.AI.Tests.csproj" />
 </Solution>
diff --git a/README.md b/README.md
@@ -306,6 +306,42 @@ app.MapGet("/ask", async (IChatClient client) =>
 });
 ```
 
+### Resolve `IChatClient` from `IServiceProvider`
+
+```csharp
+using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
+using ManagedCode.CodexSharpSDK.Models;
+using ManagedCode.CodexSharpSDK.Extensions.AI.Extensions;
+
+var services = new ServiceCollection();
+services.AddCodexChatClient(options =>
+{
+    options.DefaultModel = CodexModels.Gpt53Codex;
+});
+
+using var provider = services.BuildServiceProvider();
+var chatClient = provider.GetRequiredService<IChatClient>();
+```
+
+Keyed registration is also supported:
+
+```csharp
+using Microsoft.Extensions.AI;
+using Microsoft.Extensions.DependencyInjection;
+using ManagedCode.CodexSharpSDK.Models;
+using ManagedCode.CodexSharpSDK.Extensions.AI.Extensions;
+
+var services = new ServiceCollection();
+services.AddKeyedCodexChatClient("codex-main", options =>
+{
+    options.DefaultModel = CodexModels.Gpt53Codex;
+});
+
+using var provider = services.BuildServiceProvider();
+var keyedChatClient = provider.GetRequiredKeyedService<IChatClient>("codex-main");
+```
+
 ### Streaming
 
 ```csharp
diff --git a/docs/Architecture/Overview.md b/docs/Architecture/Overview.md
@@ -7,8 +7,8 @@ Single source of truth: this file is navigational and coarse. Detailed behavior
 ## Summary
 
 - **System:** .NET SDK wrapper over Codex CLI JSONL protocol.
-- **Where is the code:** `CodexSharpSDK`, tests in `CodexSharpSDK.Tests`.
-- **Entry points:** `CodexClient`.
+- **Where is the code:** core SDK in `CodexSharpSDK`; optional M.E.AI adapter in `CodexSharpSDK.Extensions.AI`; tests in `CodexSharpSDK.Tests` and `CodexSharpSDK.Extensions.AI.Tests`.
+- **Entry points:** `CodexClient`, `CodexChatClient` (`IChatClient` adapter).
 - **Dependencies:** local `codex` CLI process, `System.Text.Json`, .NET SDK/toolchain, GitHub Actions.
 
 ## Scoping (read first)
diff --git a/docs/Development/setup.md b/docs/Development/setup.md
@@ -20,6 +20,13 @@ git submodule update --init --recursive
 dotnet restore ManagedCode.CodexSharpSDK.slnx
 ```
 
+## Solution projects
+
+- `CodexSharpSDK/CodexSharpSDK.csproj` — core `ManagedCode.CodexSharpSDK` package.
+- `CodexSharpSDK.Extensions.AI/CodexSharpSDK.Extensions.AI.csproj` — optional `IChatClient` adapter package (`ManagedCode.CodexSharpSDK.Extensions.AI`).
+- `CodexSharpSDK.Tests/CodexSharpSDK.Tests.csproj` — core SDK tests (TUnit).
+- `CodexSharpSDK.Extensions.AI.Tests/CodexSharpSDK.Extensions.AI.Tests.csproj` — M.E.AI adapter tests (TUnit).
+
 ## Local validation
 
 ```bash
diff --git a/docs/Features/meai-integration.md b/docs/Features/meai-integration.md
diff --git a/docs/Features/release-and-sync-automation.md b/docs/Features/release-and-sync-automation.md
diff --git a/docs/Testing/strategy.md b/docs/Testing/strategy.md

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace ManagedCode.CodexSharpSDK.Extensions.AI;`
`5`	`5`
`6`	`6`	`public sealed record CodexChatClientOptions`
`7`	`7`	`{`
`8`		`- public CodexOptions? CodexOptions { get; init; }`
`9`		`- public string? DefaultModel { get; init; }`
`10`		`- public ThreadOptions? DefaultThreadOptions { get; init; }`
	`8`	`+ public CodexOptions? CodexOptions { get; set; }`
	`9`	`+ public string? DefaultModel { get; set; }`
	`10`	`+ public ThreadOptions? DefaultThreadOptions { get; set; }`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,18 @@`
`1`		`-using System.Text;`
`2`	`1`	`using ManagedCode.CodexSharpSDK.Models;`
`3`	`2`	`using Microsoft.Extensions.AI;`
`4`	`3`
`5`	`4`	`namespace ManagedCode.CodexSharpSDK.Extensions.AI.Internal;`
`6`	`5`
`7`	`6`	`internal static class ChatMessageMapper`
`8`	`7`	`{`
	`8`	`+ private const string SystemPrefix = "[System] ";`
	`9`	`+ private const string AssistantPrefix = "[Assistant] ";`
	`10`	`+ private const string ParagraphSeparator = "\n\n";`
	`11`	`+ private const string ImageMediaPrefix = "image/";`
	`12`	`+`
`9`	`13`	`internal static (string Prompt, List<DataContent> ImageContents) ToCodexInput(IEnumerable<ChatMessage> messages)`
`10`	`14`	`{`
`11`		`- var prompt = new StringBuilder();`
`12`		`- var userTextParts = new List<string>();`
	`15`	`+ var promptParts = new List<string>();`
`13`	`16`	`var imageContents = new List<DataContent>();`
`14`	`17`
`15`	`18`	`foreach (var message in messages)`
`@@ -18,38 +21,42 @@ internal static (string Prompt, List<DataContent> ImageContents) ToCodexInput(IE`
`18`	`21`	`{`
`19`	`22`	`if (message.Text is { } systemText)`
`20`	`23`	`{`
`21`		`- prompt.Append("[System] ").Append(systemText).Append("\n\n");`
	`24`	`+ promptParts.Add(string.Concat(SystemPrefix, systemText));`
`22`	`25`	`}`
	`26`	`+`
	`27`	`+ continue;`
`23`	`28`	`}`
`24`		`- else if (message.Role == ChatRole.User)`
	`29`	`+`
	`30`	`+ if (message.Role == ChatRole.User)`
`25`	`31`	`{`
	`32`	`+ var userTextParts = new List<string>();`
`26`	`33`	`foreach (var content in message.Contents)`
`27`	`34`	`{`
`28`		`- if (content is TextContent tc && tc.Text is not null)`
	`35`	`+ if (content is TextContent textContent && textContent.Text is { } text)`
`29`	`36`	`{`
`30`		`- userTextParts.Add(tc.Text);`
	`37`	`+ userTextParts.Add(text);`
`31`	`38`	`}`
`32`		`- else if (content is DataContent dc && dc.MediaType is not null && dc.MediaType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))`
	`39`	`+ else if (content is DataContent dataContent && IsImageMediaType(dataContent.MediaType))`
`33`	`40`	`{`
`34`		`- imageContents.Add(dc);`
	`41`	`+ imageContents.Add(dataContent);`
`35`	`42`	`}`
`36`	`43`	`}`
`37`		`- }`
`38`		`- else if (message.Role == ChatRole.Assistant)`
`39`		`- {`
`40`		`- if (message.Text is { } assistantText)`
	`44`	`+`
	`45`	`+ if (userTextParts.Count > 0)`
`41`	`46`	`{`
`42`		`- prompt.Append("[Assistant] ").Append(assistantText).Append("\n\n");`
	`47`	`+ promptParts.Add(string.Join(ParagraphSeparator, userTextParts));`
`43`	`48`	`}`
	`49`	`+`
	`50`	`+ continue;`
`44`	`51`	`}`
`45`		`- }`
`46`	`52`
`47`		`- if (userTextParts.Count > 0)`
`48`		`- {`
`49`		`- prompt.Append(string.Join("\n\n", userTextParts));`
	`53`	`+ if (message.Role == ChatRole.Assistant && message.Text is { } assistantText)`
	`54`	`+ {`
	`55`	`+ promptParts.Add(string.Concat(AssistantPrefix, assistantText));`
	`56`	`+ }`
`50`	`57`	`}`
`51`	`58`
`52`		`- return (prompt.ToString(), imageContents);`
	`59`	`+ return (string.Join(ParagraphSeparator, promptParts), imageContents);`
`53`	`60`	`}`
`54`	`61`
`55`	`62`	`internal static IReadOnlyList<UserInput> BuildUserInput(string prompt, IReadOnlyList<DataContent> imageContents)`
`@@ -74,6 +81,9 @@ internal static IReadOnlyList<UserInput> BuildUserInput(string prompt, IReadOnly`
`74`	`81`	`return inputs;`
`75`	`82`	`}`
`76`	`83`
	`84`	`+ private static bool IsImageMediaType(string? mediaType) =>`
	`85`	`+ mediaType is not null && mediaType.StartsWith(ImageMediaPrefix, StringComparison.OrdinalIgnoreCase);`
	`86`	`+`
`77`	`87`	`private static string GenerateFileName(string? mediaType)`
`78`	`88`	`{`
`79`	`89`	`var extension = mediaType switch`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`using System.Runtime.CompilerServices;`
`2`	`2`
`3`		`-[assembly: InternalsVisibleTo("ManagedCode.CodexSharpSDK.Extensions.AI.Tests")]`
	`3`	`+[assembly: InternalsVisibleTo("ManagedCode.CodexSharpSDK.Tests")]`