Kept the conversation, tool results, and draft apart in the token count

app/Tests/Chat/ConversationPartsTests.cs

@@ -56,7 +56,8 @@ public sealed class ConversationPartsTests
         Assert.Multiple(() =>
         {
             Assert.That(parts.Texts, Is.EqualTo(new[] { "You are helpful.", "What is the capital of France?", "Paris." }));
-            Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "And of Italy?" }));
+            Assert.That(parts.DraftText, Is.EqualTo("And of Italy?"));
+            Assert.That(parts.GrowingTexts, Is.Empty, "The draft is a part of its own, and it stands nowhere else.");
         });
     }
 
@@ -77,7 +78,8 @@ public sealed class ConversationPartsTests
         Assert.Multiple(() =>
         {
             Assert.That(parts.Texts, Is.EqualTo(new[] { "A question." }));
-            Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "The answer so far", "a draft" }));
+            Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "The answer so far" }));
+            Assert.That(parts.DraftText, Is.EqualTo("a draft"));
         });
     }
 
@@ -135,7 +137,7 @@ public sealed class ConversationPartsTests
         Assert.Multiple(() =>
         {
             Assert.That(parts.Texts, Is.Empty);
-            Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "Hello" }));
+            Assert.That(parts.DraftText, Is.EqualTo("Hello"));
         });
     }
 
@@ -149,6 +151,7 @@ public sealed class ConversationPartsTests
         {
             Assert.That(parts.Texts, Is.Empty);
             Assert.That(parts.GrowingTexts, Is.Empty);
+            Assert.That(parts.DraftText, Is.Empty);
         });
     }
 
@@ -188,7 +191,11 @@ public sealed class ConversationPartsTests
 
         var parts = ConversationParts.Of(new() { Blocks = [block] }, string.Empty, "And this one.", [FileAttachment.FromPath(draft)], imagesAreSent: true, toolDefinitions: null);
 
-        Assert.That(parts.Documents.Select(document => document.FileName), Is.EqualTo(new[] { "older.txt", "draft.txt" }));
+        Assert.Multiple(() =>
+        {
+            Assert.That(parts.Documents.Select(document => document.FileName), Is.EqualTo(new[] { "older.txt" }));
+            Assert.That(parts.DraftDocuments.Select(document => document.FileName), Is.EqualTo(new[] { "draft.txt" }), "Both count, each in the part it belongs to.");
+        });
     }
 
     [Test]
@@ -201,7 +208,7 @@ public sealed class ConversationPartsTests
 
         var parts = ConversationParts.Of(null, string.Empty, "Here", [attachment], imagesAreSent: true, toolDefinitions: null);
 
-        Assert.That(parts.Documents, Is.Empty);
+        Assert.That(parts.DraftDocuments, Is.Empty);
     }
 
     [Test]
@@ -214,8 +221,29 @@ public sealed class ConversationPartsTests
 
         Assert.Multiple(() =>
         {
-            Assert.That(parts.Documents.Select(entry => entry.FileName), Is.EqualTo(new[] { "notes.txt" }));
+            Assert.That(parts.DraftDocuments.Select(entry => entry.FileName), Is.EqualTo(new[] { "notes.txt" }));
+            Assert.That(parts.DraftImages, Is.EqualTo(1));
+        });
+    }
+
+    [Test]
+    public void ImagesOfTheConversationAndOfTheDraftAreKeptApart()
+    {
+        //
+        // A provider which reported the conversation so far counted the pictures in it as well,
+        // but never the ones which are still waiting in the composer.
+        //
+        var sent = this.WriteFile("sent.png", "not really a png");
+        var waiting = this.WriteFile("waiting.png", "not really a png either");
+        var block = Block("Look at this.");
+        ((ContentText)block.Content!).FileAttachments.Add(FileAttachment.FromPath(sent));
+
+        var parts = ConversationParts.Of(new() { Blocks = [block] }, string.Empty, "And at this.", [FileAttachment.FromPath(waiting)], imagesAreSent: true, toolDefinitions: null);
+
+        Assert.Multiple(() =>
+        {
             Assert.That(parts.Images, Is.EqualTo(1));
+            Assert.That(parts.DraftImages, Is.EqualTo(1));
         });
     }
 
@@ -230,7 +258,7 @@ public sealed class ConversationPartsTests
 
         var parts = ConversationParts.Of(null, string.Empty, "Look", [FileAttachment.FromPath(image)], imagesAreSent: false, toolDefinitions: null);
 
-        Assert.That(parts.Images, Is.Zero);
+        Assert.That(parts.DraftImages, Is.Zero);
     }
 
     [Test]
@@ -250,7 +278,8 @@ public sealed class ConversationPartsTests
         Assert.Multiple(() =>
         {
             Assert.That(parts.Texts, Is.Empty);
-            Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "What the web search found.", "What the page said." }));
+            Assert.That(parts.ToolConversation, Is.EqualTo(new[] { "What the web search found.", "What the page said." }));
+            Assert.That(parts.GrowingTexts, Is.Empty, "The tool conversation is a part of its own, so that its share can be named.");
         });
     }
 
@@ -267,7 +296,7 @@ public sealed class ConversationPartsTests
 
         var parts = ConversationParts.Of(new() { Blocks = [running] }, string.Empty, string.Empty, null, imagesAreSent: true, toolDefinitions: null);
 
-        Assert.That(parts.GrowingTexts, Is.EqualTo(new[] { "The same page.", "The same page." }));
+        Assert.That(parts.ToolConversation, Is.EqualTo(new[] { "The same page.", "The same page." }));
     }
 
     [Test]
@@ -288,7 +317,7 @@ public sealed class ConversationPartsTests
         Assert.Multiple(() =>
         {
             Assert.That(parts.Texts, Is.EqualTo(new[] { "Here is what I found." }));
-            Assert.That(parts.GrowingTexts, Is.Empty);
+            Assert.That(parts.ToolConversation, Is.Empty);
         });
     }
 

app/Tests/Chat/ConversationTokensTests.cs

@@ -25,7 +25,7 @@ public sealed class ConversationTokensTests
         var counted = new ConversationTokens
         {
             IsKnown = true,
-            UncountedImages = images,
+            Images = images,
             ImageLimits = new ImageLimits(null, allowed),
         };
 
@@ -42,7 +42,7 @@ public sealed class ConversationTokensTests
         var counted = new ConversationTokens
         {
             IsKnown = true,
-            UncountedImages = 500,
+            Images = 500,
             ImageLimits = ImageLimits.UNKNOWN,
         };
 
@@ -60,7 +60,7 @@ public sealed class ConversationTokensTests
         var counted = new ConversationTokens
         {
             IsKnown = true,
-            UncountedImages = 20,
+            Images = 20,
             ImageLimits = new ImageLimits(8, 100),
         };
 
@@ -77,7 +77,7 @@ public sealed class ConversationTokensTests
         var counted = new ConversationTokens
         {
             IsKnown = true,
-            UncountedImages = 0,
+            Images = 0,
             ImageLimits = new ImageLimits(null, 0),
         };
 
@@ -93,4 +93,64 @@ public sealed class ConversationTokensTests
         //
         Assert.That(ConversationTokens.UNAVAILABLE.TooManyImages, Is.False);
     }
+
+    [Test]
+    public void PicturesAProviderCountedAreNotCalledUncounted()
+    {
+        //
+        // What the provider reported for the conversation so far includes its pictures, however
+        // it charges them. Only those still waiting in the composer are left for nobody to count.
+        //
+        var reported = new ConversationTokens
+        {
+            IsKnown = true,
+            HistoryIsReported = true,
+            Images = 3,
+            DraftImages = 1,
+        };
+
+        var estimated = reported with { HistoryIsReported = false };
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(reported.UncountedImages, Is.EqualTo(1), "The provider counted the two which were sent.");
+            Assert.That(estimated.UncountedImages, Is.EqualTo(3), "Without a report, nobody counted any of them.");
+        });
+    }
+
+    [Test]
+    public void TooManyPicturesStaysTooManyWhenTheProviderCountedThem()
+    {
+        //
+        // The limit is on how many pictures travel, not on what they cost. A provider which has
+        // counted them still refuses the request which carries one too many.
+        //
+        var counted = new ConversationTokens
+        {
+            IsKnown = true,
+            HistoryIsReported = true,
+            Images = 10,
+            ImageLimits = new ImageLimits(8, null),
+        };
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(counted.UncountedImages, Is.Zero);
+            Assert.That(counted.TooManyImages, Is.True);
+        });
+    }
+
+    [Test]
+    public void TheWholeNumberIsTheConversationAndTheDraft()
+    {
+        var counted = new ConversationTokens
+        {
+            IsKnown = true,
+            HistoryTokens = 12_400,
+            ToolTokens = 9_000,
+            DraftTokens = 340,
+        };
+
+        Assert.That(counted.Tokens, Is.EqualTo(12_740), "The tools' share is part of the conversation, not added on top of it.");
+    }
 }