Merge claudedo/b0317ec7aa1a4584ad2cca1e69cf8dd7

tests/ClaudeDo.Data.Tests/ModelPresetsTests.cs

@@ -65,6 +65,44 @@ public class ModelPresetsTests
         Assert.True(row.MaxTurns > 0);
     }
 
+    [Fact]
+    public void For_unknown_model_uses_the_supplied_fallback_max_turns_instead_of_a_hardcoded_number()
+    {
+        var row = ModelPresets.For(ModelPresets.Defaults, "some-future-model", fallbackMaxTurns: 100);
+
+        Assert.Equal(100, row.MaxTurns);
+    }
+
+    [Fact]
+    public void For_a_full_model_id_resolves_to_its_alias_preset_row_not_the_unknown_fallback()
+    {
+        var sonnetPreset = ModelPresets.For(ModelPresets.Defaults, "sonnet");
+
+        var row = ModelPresets.For(ModelPresets.Defaults, "claude-sonnet-4-6");
+
+        Assert.Equal(sonnetPreset.Effort, row.Effort);
+        Assert.Equal(sonnetPreset.MaxTurns, row.MaxTurns);
+    }
+
+    [Fact]
+    public void For_a_full_model_id_honors_a_customized_preset_row_for_its_alias()
+    {
+        var parsed = ModelPresets.Parse(ModelPresets.Serialize(new[] { new ModelPreset("sonnet", "xhigh", 77) }));
+
+        var row = ModelPresets.For(parsed, "claude-sonnet-4-6");
+
+        Assert.Equal("xhigh", row.Effort);
+        Assert.Equal(77, row.MaxTurns);
+    }
+
+    [Fact]
+    public void For_unknown_model_never_throws_and_still_starts_a_run()
+    {
+        var exception = Record.Exception(() => ModelPresets.For(ModelPresets.Defaults, "totally-unrecognized-model"));
+
+        Assert.Null(exception);
+    }
+
     [Fact]
     public void For_null_model_uses_the_default_alias()
     {

tests/ClaudeDo.Data.Tests/ModelRegistryTests.cs

@@ -33,4 +33,28 @@ public class ModelRegistryTests
     {
         Assert.Equal(new[] { "haiku", "sonnet", "opus" }, ModelRegistry.ByCostAscending);
     }
+
+    [Theory]
+    [InlineData("sonnet", "sonnet")]
+    [InlineData("OPUS", "opus")]
+    [InlineData(" haiku ", "haiku")]
+    [InlineData("claude-sonnet-4-6", "sonnet")]
+    [InlineData("claude-opus-4-6", "opus")]
+    [InlineData("claude-haiku-4-5-20251001", "haiku")]
+    [InlineData("us.anthropic.claude-sonnet-4-6-v1:0", "sonnet")]
+    public void TryNormalizeAlias_matches_aliases_and_full_model_ids(string input, string expected)
+    {
+        Assert.Equal(expected, ModelRegistry.TryNormalizeAlias(input));
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData("gpt-4")]
+    [InlineData("some-future-model")]
+    public void TryNormalizeAlias_never_throws_and_returns_null_when_unrecognized(string? input)
+    {
+        Assert.Null(ModelRegistry.TryNormalizeAlias(input));
+    }
 }