Merge branch 'main' into dependabot/nuget/src/CodePunk.Console/multi-2af7ad6f9e

Author: neil-gilbert

README.md

@@ -287,6 +287,19 @@ Files & directories:
 
 See `ROADMAP.md` for upcoming enhancements (model listing, provider extensions, improved tool system).
 
+### Open Backlog Items
+
+The following technical tasks were identified but not completed in this change set:
+
+- Add Spectre.Console output capture helper for asserting error/markup content in CLI scenario tests.
+- Add test covering `ChatSessionEventType.ToolLoopExceeded` (tool loop exceeded event) in streaming and non-stream paths.
+- Consolidate `TrimTitle` logic (currently implemented separately in `NewCommand` and `RootCommandFactory`).
+- Extract a shared test host factory for Core chat unit tests (similar to `ConsoleTestHostFactory`).
+- Introduce streaming fallback test verifying max tool iteration fallback in streaming API (`SendMessageStreamAsync`).
+- Eliminate remaining analyzer warnings (e.g. nullable dereference in `NewCommandTests`, any residual async warnings).
+- Provide documentation for run command agent/model override precedence and tool iteration/fallback behavior.
+- Optional: Add quiet/diagnostic toggle to reduce console noise during test runs.
+
 ### Areas for Contribution
 - **AI Provider Integration**: Add local models, Azure OpenAI, or other providers
 - **Tool Development**: Create tools for specific languages or frameworks

ROADMAP.md

@@ -3,24 +3,24 @@
 Status legend: ✅ done · 🔄 in-progress · ⏳ planned · 🧪 needs tests · 🧹 refactor · ❗ open decision
 
 ## 1. CLI & UX
-- ⏳ Enhance `models` command: enumerate real models from providers (OpenAI / Anthropic) instead of placeholder
-- ⏳ Add `--json` output option for `run`, `auth list`, `agent list`, `models`
-- ⏳ Graceful error when no providers / API keys configured (clear guidance to run `codepunk auth login`)
+- ✅ Enhance `models` command: enumerate real models (dynamic fetch + fallback) & show key presence (9 Sep 2025)
+- 🧪 Add `--json` output option for `run`, `auth list`, `agent list` (partial: `models` already supports) 
+- ✅ Graceful error when no providers / API keys configured (guidance message implemented)
 - ⏳ Root-level `sessions` management (list, show, load) mirrored from interactive commands
 - ⏳ Add `--provider` / `--model` flags to `run` that override agent defaults (already partially supported internally, needs docs & tests)
 - ⏳ Interactive: command autocompletion (tab) & history persistence
 
 ## 2. Chat / Session Core
-- 🔄 Temporary timing fix uses `Task.Delay(1)` to surface `IsProcessing`; replace with event-based or `IProgress` notification (remove artificial delay)
+- ✅ Replaced artificial `Task.Delay(1)` with channel-based event stream (MessageStart/Complete, ToolIteration*, StreamDelta) (9 Sep 2025)
 - ⏳ Session pruning / archive strategy (size limits, rotation)
 - ⏳ Export session to markdown / JSON command
 - ⏳ Import session from JSON file
 
 ## 3. Providers & Models
-- ⏳ Azure OpenAI provider implementation
+- 🧪 Azure OpenAI provider implementation (pending)
 - ⏳ Local model provider(s): Ollama + LM Studio
 - ⏳ Dynamic provider discovery via configuration section scanning
-- ⏳ Model capability metadata (max tokens, supports tools, streaming) exposed to UX
+- ✅ Model capability metadata surfaced (context/max/tools/streaming columns + JSON) (9 Sep 2025)
 
 ## 4. Tooling System
 - ⏳ Add file search / grep tool (fast code reference)
@@ -50,17 +50,18 @@ Status legend: ✅ done · 🔄 in-progress · ⏳ planned · 🧪 needs tests 
 
 ## 9. Testing Strategy
 - ✅ Added DI resolution test for interactive loop & renderer
-- 🔄 Need scenario tests:
-  - 🧪 `run` command: new session creation, `--continue`, `--session`, conflict of `--continue` + `--session`
+- ✅ Models command auth state tests (hasKey, filter, JSON hasKey) (9 Sep 2025)
+- ✅ Event stream ordering & streaming delta tests (9 Sep 2025)
+- 🔄 Remaining scenario tests:
+  - 🧪 `run` command: new session creation, `--continue`, `--session`, conflict handling
   - 🧪 Agent override precedence (agent model vs `--model` flag)
-  - 🧪 Models command output with authenticated vs unauthenticated state
-  - 🧪 Auth / Agent command round-trip snapshot (create/list/show/delete)
-  - 🧪 Root invocation with no args enters interactive mode (detect via injected test console abstraction)
+  - 🧪 Auth / Agent round-trip snapshot
+  - 🧪 Root invocation no-args interactive detection
 - ⏳ Provider missing key error path tests
 - ⏳ Performance regression micro-benchmarks (streaming throughput)
 
 ## 10. Refactors / Tech Debt
-- 🧹 Extract Program.cs service registrations into `AddCodePunkConsole()` extension
+- ✅ Extracted Program.cs service registrations into `AddCodePunkConsole()` extension (9 Sep 2025)
 - 🧹 Introduce `IInteractiveChatLoop` interface (simplify mocking / test harness)
 - 🧹 Collapse duplicated test host bootstrapping into shared factory
 - 🧹 Consolidate file store persistence patterns (tmp + atomic move) into utility
@@ -90,14 +91,15 @@ Status legend: ✅ done · 🔄 in-progress · ⏳ planned · 🧪 needs tests 
 ---
 
 ### Immediate Next Sprint Candidates
-1. Replace `Task.Delay(1)` with event-driven processing state (Chat session stabilization)
-2. Real model listing + provider key validation in `models` command
-3. `run` command scenario & conflict tests
-4. Auth / Agent snapshot tests
-5. Refactor DI registrations into extension method
+1. `run` command scenario & conflict tests
+2. Agent override precedence tests
+3. Auth / Agent snapshot tests
+4. Config paths command
+5. Provider missing key error tests & Azure OpenAI provider spike
 
 ### Notes
-- Current test stats: 93 total (92 passing, 1 skipped) after DI / renderer registration fix.
+- Current test stats: 108 total (107 passing, 1 skipped) after event stream + models + DI refactor.
 - Temporary heuristics: token estimation via char/4; upgrade to tokenizer libs later.
+- Channel event stream now source of truth for processing state; future UI can subscribe.
 
 Feel free to append inline decisions or sign off on completed items using initials + date.

src/CodePunk.Console/CodePunk.Console.csproj

@@ -17,8 +17,8 @@
     <PackageReference Include="Spectre.Console" Version="0.50.0" />
   <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   <PackageReference Include="OpenTelemetry" Version="1.12.0" />
-  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
   <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
+  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
   </ItemGroup>
 
   <ItemGroup>

src/CodePunk.Console/Commands/BuiltInCommands.cs

@@ -63,10 +63,18 @@ public class NewCommand : ChatCommand
     public override string Description => "Start a new chat session";
     public override string[] Aliases => ["n"];
 
+    private static string TrimTitle(string title)
+    {
+        if (string.IsNullOrWhiteSpace(title)) return title;
+        const int max = 80;
+        var trimmed = title.Trim();
+        return trimmed.Length > max ? trimmed[..max] : trimmed;
+    }
+
     public override Task<CommandResult> ExecuteAsync(string[] args, CancellationToken cancellationToken = default)
     {
         var sessionTitle = args.Length > 0 
-            ? string.Join(" ", args)
+            ? TrimTitle(string.Join(" ", args))
             : $"Chat Session {DateTime.Now:yyyy-MM-dd HH:mm}";
     return Task.FromResult(CommandResult.ClearSession($"{ConsoleStyles.Success("✓")} New session: {ConsoleStyles.Accent(sessionTitle)}"));
     }

src/CodePunk.Console/Commands/RootCommandFactory.cs

@@ -15,6 +15,13 @@ namespace CodePunk.Console.Commands;
 
 internal static class RootCommandFactory
 {
+    private const int MaxTitleLength = 80;
+    private static string TrimTitle(string title)
+    {
+        if (string.IsNullOrWhiteSpace(title)) return title;
+        var trimmed = title.Trim();
+        return trimmed.Length > MaxTitleLength ? trimmed[..MaxTitleLength] : trimmed;
+    }
     public static RootCommand Create(IServiceProvider services)
     {
     var root = new RootCommand("CodePunk CLI")
@@ -79,13 +86,14 @@ private static Command BuildRun(IServiceProvider services)
                     }
                 }
                 services.GetRequiredService<InteractiveChatSession>().UpdateDefaults(providerOverride, modelOverride);
+                var resolvedModelForStore = modelOverride ?? (string.IsNullOrWhiteSpace(model) ? null : model);
                 if (string.IsNullOrWhiteSpace(sessionId))
                 {
-                    sessionId = await sessionStore.CreateAsync(TrimTitle(message), agent, model);
+                    sessionId = await sessionStore.CreateAsync(TrimTitle(message), agent, resolvedModelForStore);
                 }
                 else if (await sessionStore.GetAsync(sessionId) == null)
                 {
-                    sessionId = await sessionStore.CreateAsync(TrimTitle(message), agent, model);
+                    sessionId = await sessionStore.CreateAsync(TrimTitle(message), agent, resolvedModelForStore);
                 }
                 await sessionStore.AppendMessageAsync(sessionId, "user", message);
                 var response = await chatLoop.RunSingleAsync(message);
@@ -239,17 +247,23 @@ private static Command BuildAgent(IServiceProvider services)
     private static Command BuildModels(IServiceProvider services)
     {
         var jsonOpt = new Option<bool>("--json", "Output JSON");
-        var cmd = new Command("models", "List available models from configured providers") { jsonOpt };
+        var availableOnlyOpt = new Option<bool>("--available-only", "Show only providers with stored API keys");
+        var cmd = new Command("models", "List available models from configured providers") { jsonOpt, availableOnlyOpt };
         cmd.SetHandler(async (InvocationContext ctx) =>
         {
             try
             {
                 var json = ctx.ParseResult.GetValueForOption(jsonOpt);
+                var availableOnly = ctx.ParseResult.GetValueForOption(availableOnlyOpt);
                 var llm = services.GetRequiredService<ILLMService>();
                 var providers = llm.GetProviders() ?? Array.Empty<ILLMProvider>();
-                var rows = new List<(string Provider,string Id,string Name,int Context,int MaxTokens,bool Tools,bool Streaming)>();
+                var authStore = services.GetRequiredService<IAuthStore>();
+                var authenticated = (await authStore.LoadAsync()).Keys.ToHashSet(StringComparer.OrdinalIgnoreCase);
+                var rows = new List<(string Provider,string Id,string Name,int Context,int MaxTokens,bool Tools,bool Streaming,bool HasKey)>();
                 foreach (var p in providers.OrderBy(p => p.Name, StringComparer.OrdinalIgnoreCase))
                 {
+                    var hasKey = authenticated.Contains(p.Name) || authenticated.Contains(p.Name.Replace("Provider","", StringComparison.OrdinalIgnoreCase));
+                    if (availableOnly && !hasKey) continue;
                     IReadOnlyList<CodePunk.Core.Abstractions.LLMModel> remote = Array.Empty<CodePunk.Core.Abstractions.LLMModel>();
                     try
                     {
@@ -259,12 +273,12 @@ private static Command BuildModels(IServiceProvider services)
 
                     var models = (remote != null && remote.Count > 0) ? remote : p.Models;
                     foreach (var m in models.OrderBy(m => m.Id, StringComparer.OrdinalIgnoreCase))
-                        rows.Add((p.Name, m.Id, m.Name, m.ContextWindow, m.MaxTokens, m.SupportsTools, m.SupportsStreaming));
+                        rows.Add((p.Name, m.Id, m.Name, m.ContextWindow, m.MaxTokens, m.SupportsTools, m.SupportsStreaming, hasKey));
                 }
                 var writer = ctx.Console.Out;
                 if (json)
                 {
-                    var jsonOut = System.Text.Json.JsonSerializer.Serialize(rows.Select(r => new { provider = r.Provider, id = r.Id, name = r.Name, context = r.Context, maxTokens = r.MaxTokens, tools = r.Tools, streaming = r.Streaming }), new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+                    var jsonOut = System.Text.Json.JsonSerializer.Serialize(rows.Select(r => new { provider = r.Provider, id = r.Id, name = r.Name, context = r.Context, maxTokens = r.MaxTokens, tools = r.Tools, streaming = r.Streaming, hasKey = r.HasKey }), new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
                     writer.Write(jsonOut + "\n");
                     return;
                 }
@@ -290,9 +304,11 @@ private static Command BuildModels(IServiceProvider services)
                 table.AddColumn(new TableColumn("Max").Centered());
                 table.AddColumn(new TableColumn("Tools").Centered());
                 table.AddColumn(new TableColumn("Stream").Centered());
+                table.AddColumn(new TableColumn("Key").Centered());
                 foreach (var r in rows)
                 {
-                    table.AddRow(ConsoleStyles.Accent(r.Provider), r.Id, r.Name, r.Context.ToString(), r.MaxTokens.ToString(), r.Tools?"[green]✓[/]":"[grey]-[/]", r.Streaming?"[green]✓[/]":"[grey]-[/]");
+                    var providerLabel = r.HasKey ? ConsoleStyles.Accent(r.Provider) : $"[grey]{r.Provider}[/]";
+                    table.AddRow(providerLabel, r.Id, r.Name, r.Context.ToString(), r.MaxTokens.ToString(), r.Tools?"[green]✓[/]":"[grey]-[/]", r.Streaming?"[green]✓[/]":"[grey]-[/]", r.HasKey?"[green]✓[/]":"[red]✗[/]");
                     writer.Write($"{r.Provider}\t{r.Id}\t{r.Name}\n");
                 }
                 console?.Write(table);
@@ -356,9 +372,4 @@ internal static Command CreateModelsCommandForTests(IServiceProvider services)
         return cmd;
     }
 
-    private static string TrimTitle(string input)
-    {
-        var oneLine = input.Replace("\n", " ").Trim();
-        return oneLine.Length <= 60 ? oneLine : oneLine[..60];
-    }
 }

src/CodePunk.Console/Configuration/ConsoleServiceCollectionExtensions.cs

@@ -0,0 +1,36 @@
+using CodePunk.Console.Chat;
+using CodePunk.Console.Commands;
+using CodePunk.Console.Rendering;
+using CodePunk.Console.Stores;
+using CodePunk.Core.Chat;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console;
+
+namespace CodePunk.Console.Configuration;
+
+public static class ConsoleServiceCollectionExtensions
+{
+    public static IServiceCollection AddCodePunkConsole(this IServiceCollection services)
+    {
+        services.AddSingleton<IAnsiConsole>(AnsiConsole.Console);
+        services.AddSingleton<IAuthStore, AuthFileStore>();
+        services.AddSingleton<IAgentStore, AgentFileStore>();
+        services.AddSingleton<ISessionFileStore, SessionFileStore>();
+
+        services.AddScoped<InteractiveChatLoop>();
+        services.AddSingleton(new StreamingRendererOptions { LiveEnabled = false });
+        services.AddSingleton<StreamingResponseRenderer>();
+
+        services.AddTransient<ChatCommand, HelpCommand>();
+        services.AddTransient<ChatCommand, NewCommand>();
+        services.AddTransient<ChatCommand, QuitCommand>();
+        services.AddTransient<ChatCommand, ClearCommand>();
+        services.AddTransient<ChatCommand, SessionsCommand>();
+        services.AddTransient<ChatCommand, LoadCommand>();
+        services.AddTransient<ChatCommand, UseCommand>();
+        services.AddTransient<ChatCommand, UsageCommand>();
+        services.AddTransient<ChatCommand, ModelsChatCommand>();
+        services.AddSingleton<CommandProcessor>();
+        return services;
+    }
+}

src/CodePunk.Console/Program.cs

@@ -1,6 +1,7 @@
 using CodePunk.Console.Chat;
 using CodePunk.Console.Commands;
 using CodePunk.Console.Rendering;
+using CodePunk.Console.Configuration;
 using CodePunk.Console.Stores;
 using CodePunk.Infrastructure.Configuration;
 using CodePunk.Console.Themes;
@@ -46,25 +47,7 @@
 
 builder.Services.AddCodePunkServices(builder.Configuration);
 
-builder.Services.AddSingleton<IAnsiConsole>(Spectre.Console.AnsiConsole.Console);
-builder.Services.AddSingleton<IAuthStore, AuthFileStore>();
-builder.Services.AddSingleton<IAgentStore, AgentFileStore>();
-builder.Services.AddSingleton<ISessionFileStore, SessionFileStore>();
-
-builder.Services.AddScoped<InteractiveChatLoop>();
-builder.Services.AddSingleton(new StreamingRendererOptions { LiveEnabled = false });
-builder.Services.AddSingleton<StreamingResponseRenderer>();
-
-builder.Services.AddTransient<ChatCommand, HelpCommand>();
-builder.Services.AddTransient<ChatCommand, NewCommand>();
-builder.Services.AddTransient<ChatCommand, QuitCommand>();
-builder.Services.AddTransient<ChatCommand, ClearCommand>();
-builder.Services.AddTransient<ChatCommand, SessionsCommand>();
-builder.Services.AddTransient<ChatCommand, LoadCommand>();
-builder.Services.AddTransient<ChatCommand, UseCommand>();
-builder.Services.AddTransient<ChatCommand, UsageCommand>();
-builder.Services.AddTransient<ChatCommand, ModelsChatCommand>();
-builder.Services.AddSingleton<CommandProcessor>();
+builder.Services.AddCodePunkConsole();
 
 var host = builder.Build();
 await host.Services.EnsureDatabaseCreatedAsync();

src/CodePunk.Core/Chat/ChatSessionEvents.cs

@@ -0,0 +1,52 @@
+using System.Threading.Channels;
+
+namespace CodePunk.Core.Chat;
+
+public enum ChatSessionEventType
+{
+    MessageStart,
+    StreamDelta,
+    MessageComplete,
+    ToolIterationStart,
+    ToolIterationEnd,
+    ToolLoopExceeded,
+    SessionCleared
+}
+
+public record ChatSessionEvent(
+    ChatSessionEventType Type,
+    string? SessionId = null,
+    int? Iteration = null,
+    string? Delta = null,
+    bool? IsFinal = null,
+    DateTime? Utc = null)
+{
+    public DateTime Timestamp => Utc ?? DateTime.UtcNow;
+}
+
+public interface IChatSessionEventStream
+{
+    ChannelReader<ChatSessionEvent> Reader { get; }
+    bool TryWrite(ChatSessionEvent evt);
+}
+
+public class ChatSessionEventStream : IChatSessionEventStream
+{
+    private readonly Channel<ChatSessionEvent> _channel;
+
+    public ChatSessionEventStream()
+    {
+        _channel = Channel.CreateUnbounded<ChatSessionEvent>(new UnboundedChannelOptions
+        {
+            SingleWriter = true,
+            AllowSynchronousContinuations = true
+        });
+    }
+
+    public ChannelReader<ChatSessionEvent> Reader => _channel.Reader;
+
+    public bool TryWrite(ChatSessionEvent evt)
+    {
+        return _channel.Writer.TryWrite(evt);
+    }
+}