Archive completed meeting assistant changes

MeetingAssistant.Tests/MeetingScreenshotServiceTests.cs

@@ -1,6 +1,8 @@
 using MeetingAssistant.MeetingNotes;
 using MeetingAssistant.Screenshots;
+using MeetingAssistant.Speakers;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 using System.Drawing;
 using System.Drawing.Imaging;
 
@@ -130,6 +132,165 @@ public sealed class MeetingScreenshotServiceTests
         Assert.Contains("Shared screen text", context);
     }
 
+    [Fact]
+    public async Task CaptureAddsOcrAttendeesToMeetingNoteThroughCanonicalizer()
+    {
+        var fixture = await ScreenshotFixture.CreateAsync(
+            options =>
+            {
+                options.Screenshots.Ocr.Enabled = true;
+            },
+            attendees: ["Ada Lovelace"]);
+        var ocr = new CapturingScreenshotOcrClient(
+            "Visible participant tiles: Ada, Grace, and Ada again.",
+            attendees: ["Ada L.", "Grace Hopper", "Ada Lovelace"]);
+        var canonicalizer = new MappingAttendeeCanonicalizer(new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["Ada L."] = "Ada Lovelace"
+        });
+        var service = fixture.CreateService(
+            new FixedScreenshotCapture([1, 2, 3]),
+            ocr,
+            canonicalizer);
+
+        await service.CaptureAsync(
+            fixture.Artifacts,
+            DateTimeOffset.Parse("2026-05-26T10:00:00+02:00"),
+            DateTimeOffset.Parse("2026-05-26T10:00:10+02:00"),
+            fixture.Options,
+            CancellationToken.None);
+        await service.WaitForPendingOcrAsync(fixture.Artifacts, TimeSpan.FromSeconds(5), CancellationToken.None);
+
+        var meeting = await fixture.NoteStore.ReadAsync(fixture.Artifacts.MeetingNotePath, CancellationToken.None);
+        Assert.Equal(["Ada Lovelace", "Grace Hopper"], meeting.Frontmatter.Attendees);
+        Assert.Contains(canonicalizer.Requests, request =>
+            request.SequenceEqual(["Ada Lovelace", "Ada L.", "Grace Hopper", "Ada Lovelace"]));
+    }
+
+    [Fact]
+    public async Task CaptureWritesRetryLinkWhenOcrFails()
+    {
+        var fixture = await ScreenshotFixture.CreateAsync(options =>
+        {
+            options.Api.PublicBaseUrl = "http://localhost:5090";
+            options.Screenshots.Ocr.Enabled = true;
+        });
+        var service = fixture.CreateService(
+            new FixedScreenshotCapture([1, 2, 3]),
+            new ThrowingScreenshotOcrClient("vision offline"));
+
+        var result = await service.CaptureAsync(
+            fixture.Artifacts,
+            DateTimeOffset.Parse("2026-05-26T10:00:00+02:00"),
+            DateTimeOffset.Parse("2026-05-26T10:00:10+02:00"),
+            fixture.Options,
+            CancellationToken.None);
+        await service.WaitForPendingOcrAsync(fixture.Artifacts, TimeSpan.FromSeconds(5), CancellationToken.None);
+
+        var context = await File.ReadAllTextAsync(fixture.Artifacts.AssistantContextPath);
+        var screenshotId = ExtractScreenshotOcrId(context);
+        Assert.Contains("_OCR failed: vision offline_", context);
+        Assert.Contains("<!-- screenshot-ocr:", context);
+        Assert.Contains("<!-- /screenshot-ocr:", context);
+        Assert.Contains("[Retry screenshot OCR](http://localhost:5090/meetings/screenshot-ocr/retry?", context);
+        Assert.Contains($"screenshotId={screenshotId}", context);
+        Assert.Contains($"screenshotPath={Uri.EscapeDataString(result.ScreenshotPath)}", context);
+        Assert.Contains($"assistantContextPath={Uri.EscapeDataString(fixture.Artifacts.AssistantContextPath)}", context);
+    }
+
+    [Fact]
+    public async Task RetryOcrReplacesFailureForSameScreenshot()
+    {
+        var fixture = await ScreenshotFixture.CreateAsync(options =>
+        {
+            options.Screenshots.Ocr.Enabled = true;
+        });
+        var ocr = new SequencedScreenshotOcrClient(
+            new InvalidOperationException("vision offline"),
+            new ScreenshotOcrResult("Retried OCR text", null, ["Grace Hopper"]));
+        var service = fixture.CreateService(
+            new FixedScreenshotCapture([1, 2, 3]),
+            ocr);
+
+        var result = await service.CaptureAsync(
+            fixture.Artifacts,
+            DateTimeOffset.Parse("2026-05-26T10:00:00+02:00"),
+            DateTimeOffset.Parse("2026-05-26T10:00:10+02:00"),
+            fixture.Options,
+            CancellationToken.None);
+        await service.WaitForPendingOcrAsync(fixture.Artifacts, TimeSpan.FromSeconds(5), CancellationToken.None);
+        var failedContext = await File.ReadAllTextAsync(fixture.Artifacts.AssistantContextPath);
+        var screenshotId = ExtractScreenshotOcrId(failedContext);
+
+        var retry = await service.TriggerOcrRetryAsync(
+            fixture.Artifacts,
+            result.ScreenshotPath,
+            screenshotId,
+            fixture.Options,
+            CancellationToken.None);
+        await service.WaitForPendingOcrAsync(fixture.Artifacts, TimeSpan.FromSeconds(5), CancellationToken.None);
+
+        Assert.NotNull(retry);
+        Assert.Equal(result.ScreenshotPath, retry.ScreenshotPath);
+        Assert.Equal(screenshotId, retry.ScreenshotId);
+        Assert.Equal([result.ScreenshotPath, result.ScreenshotPath], ocr.ScreenshotPaths);
+        var context = await File.ReadAllTextAsync(fixture.Artifacts.AssistantContextPath);
+        Assert.Contains("### OCR", context);
+        Assert.Contains("Retried OCR text", context);
+        Assert.DoesNotContain("vision offline", context);
+        Assert.DoesNotContain("Retry screenshot OCR", context);
+        Assert.DoesNotContain("<!-- screenshot-ocr:", context);
+    }
+
+    [Fact]
+    public async Task ProcessMeetingNoteImageEmbedsAppendsContextAndRunsOcrWithoutCropOrAttendees()
+    {
+        var fixture = await ScreenshotFixture.CreateAsync(
+            options =>
+            {
+                options.Screenshots.Ocr.Enabled = true;
+            },
+            attendees: ["Ada Lovelace"],
+            userNotes: "Discussed ![[whiteboard.png]] and ![Diagram](attachments/diagram.png).");
+        var noteFolder = Path.GetDirectoryName(fixture.Artifacts.MeetingNotePath)!;
+        var attachmentsFolder = Path.Combine(noteFolder, "attachments");
+        Directory.CreateDirectory(attachmentsFolder);
+        var whiteboardPath = Path.Combine(noteFolder, "whiteboard.png");
+        var diagramPath = Path.Combine(attachmentsFolder, "diagram.png");
+        await File.WriteAllBytesAsync(whiteboardPath, [1, 2, 3]);
+        await File.WriteAllBytesAsync(diagramPath, [4, 5, 6]);
+        var ocr = new CapturingScreenshotOcrClient(
+            "Manual image OCR",
+            new ScreenshotCropCoordinates(1, 1, 2, 2),
+            ["Grace Hopper"]);
+        var service = fixture.CreateService(
+            new FixedScreenshotCapture([1, 2, 3]),
+            ocr);
+        var originalMeetingNote = await File.ReadAllTextAsync(fixture.Artifacts.MeetingNotePath);
+
+        var result = await service.ProcessMeetingNoteImageEmbedsAsync(
+            fixture.Artifacts,
+            fixture.Options,
+            CancellationToken.None);
+        await service.WaitForPendingOcrAsync(fixture.Artifacts, TimeSpan.FromSeconds(5), CancellationToken.None);
+
+        Assert.Equal(2, result.QueuedCount);
+        Assert.Equal(2, ocr.CallCount);
+        Assert.Equal([whiteboardPath, diagramPath], ocr.ScreenshotPaths);
+        var context = await File.ReadAllTextAsync(fixture.Artifacts.AssistantContextPath);
+        Assert.Contains("## Meeting Note Image", context);
+        Assert.Contains("Image from meeting note.", context);
+        Assert.Contains("Original embed: `![[whiteboard.png]]`", context);
+        Assert.Contains("Original embed: `![Diagram](attachments/diagram.png)`", context);
+        Assert.Contains("whiteboard.png", context);
+        Assert.Contains("diagram.png", context);
+        Assert.Contains("Manual image OCR", context);
+        Assert.DoesNotContain("Cropped screenshot", context);
+        Assert.Equal(originalMeetingNote, await File.ReadAllTextAsync(fixture.Artifacts.MeetingNotePath));
+        var meeting = await fixture.NoteStore.ReadAsync(fixture.Artifacts.MeetingNotePath, CancellationToken.None);
+        Assert.Equal(["Ada Lovelace"], meeting.Frontmatter.Attendees);
+    }
+
     [Fact]
     public async Task WaitForPendingOcrWaitsForRunningScreenshotOcr()
     {
@@ -192,11 +353,13 @@ public sealed class MeetingScreenshotServiceTests
         private ScreenshotFixture(
             MeetingAssistantOptions options,
             MeetingSessionArtifacts artifacts,
-            MarkdownMeetingArtifactStore artifactStore)
+            MarkdownMeetingArtifactStore artifactStore,
+            MarkdownMeetingNoteStore noteStore)
         {
             Options = options;
             Artifacts = artifacts;
             ArtifactStore = artifactStore;
+            NoteStore = noteStore;
         }
 
         public MeetingAssistantOptions Options { get; }
@@ -205,8 +368,12 @@ public sealed class MeetingScreenshotServiceTests
 
         public MarkdownMeetingArtifactStore ArtifactStore { get; }
 
+        public MarkdownMeetingNoteStore NoteStore { get; }
+
         public static async Task<ScreenshotFixture> CreateAsync(
-            Action<MeetingAssistantOptions>? configure = null)
+            Action<MeetingAssistantOptions>? configure = null,
+            IReadOnlyList<string>? attendees = null,
+            string userNotes = "")
         {
             var root = Path.Combine(Path.GetTempPath(), "meeting-assistant-tests", Guid.NewGuid().ToString("N"));
             var options = new MeetingAssistantOptions
@@ -218,6 +385,9 @@ public sealed class MeetingScreenshotServiceTests
                 }
             };
             configure?.Invoke(options);
+            var noteStore = new MarkdownMeetingNoteStore(
+                Microsoft.Extensions.Options.Options.Create(options),
+                NullLogger<MarkdownMeetingNoteStore>.Instance);
             var artifacts = new MeetingSessionArtifacts(
                 Path.Combine(root, "Notes", "meeting.md"),
                 Path.Combine(root, "Transcripts", "transcript.md"),
@@ -225,6 +395,7 @@ public sealed class MeetingScreenshotServiceTests
                 Path.Combine(root, "Summaries", "summary.md"));
             var artifactStore = new MarkdownMeetingArtifactStore(
                 NullLogger<MarkdownMeetingArtifactStore>.Instance);
+            Directory.CreateDirectory(Path.GetDirectoryName(artifacts.MeetingNotePath)!);
             var meeting = MeetingNoteTemplate.Create(
                 "Planning",
                 DateTimeOffset.Parse("2026-05-26T10:00:00+02:00"),
@@ -232,24 +403,33 @@ public sealed class MeetingScreenshotServiceTests
                 assistantContextPath: artifacts.AssistantContextPath,
                 summaryPath: artifacts.SummaryPath) with
             {
-                Path = artifacts.MeetingNotePath
+                Path = artifacts.MeetingNotePath,
+                UserNotes = userNotes
             };
+            meeting.Frontmatter.Attendees = attendees?.ToList() ?? [];
+            var savedMeeting = await noteStore.SaveAsync(
+                meeting,
+                options,
+                CancellationToken.None);
             await artifactStore.CreateAssistantContextAsync(
                 artifacts,
-                meeting,
+                savedMeeting,
                 "",
                 null,
                 CancellationToken.None);
-            return new ScreenshotFixture(options, artifacts, artifactStore);
+            return new ScreenshotFixture(options, artifacts, artifactStore, noteStore);
         }
 
         public MeetingScreenshotService CreateService(
             IActiveWindowScreenshotCapture capture,
-            IScreenshotOcrClient ocrClient)
+            IScreenshotOcrClient ocrClient,
+            ISpeakerIdentityAttendeeCanonicalizer? attendeeCanonicalizer = null)
         {
             return new MeetingScreenshotService(
                 capture,
                 ArtifactStore,
+                NoteStore,
+                attendeeCanonicalizer ?? PassthroughSpeakerIdentityAttendeeCanonicalizer.Instance,
                 ocrClient,
                 NullLogger<MeetingScreenshotService>.Instance);
         }
@@ -276,15 +456,18 @@ public sealed class MeetingScreenshotServiceTests
 
         public CapturingScreenshotOcrClient(
             string text = "",
-            ScreenshotCropCoordinates? crop = null)
+            ScreenshotCropCoordinates? crop = null,
+            IReadOnlyList<string>? attendees = null)
         {
-            result = new ScreenshotOcrResult(text, crop);
+            result = new ScreenshotOcrResult(text, crop, attendees ?? []);
         }
 
         public int CallCount { get; private set; }
 
         public string? Prompt { get; private set; }
 
+        public List<string> ScreenshotPaths { get; } = [];
+
         public Task<ScreenshotOcrResult> ExtractAsync(
             string screenshotPath,
             string prompt,
@@ -293,6 +476,7 @@ public sealed class MeetingScreenshotServiceTests
         {
             CallCount++;
             Prompt = prompt;
+            ScreenshotPaths.Add(screenshotPath);
             return Task.FromResult(result);
         }
     }
@@ -320,7 +504,79 @@ public sealed class MeetingScreenshotServiceTests
 
         public void Release(string value)
         {
-            result.TrySetResult(new ScreenshotOcrResult(value, null));
+            result.TrySetResult(new ScreenshotOcrResult(value, null, []));
+        }
+    }
+
+    private sealed class ThrowingScreenshotOcrClient : IScreenshotOcrClient
+    {
+        private readonly string message;
+
+        public ThrowingScreenshotOcrClient(string message)
+        {
+            this.message = message;
+        }
+
+        public Task<ScreenshotOcrResult> ExtractAsync(
+            string screenshotPath,
+            string prompt,
+            MeetingAssistantOptions options,
+            CancellationToken cancellationToken)
+        {
+            throw new InvalidOperationException(message);
+        }
+    }
+
+    private sealed class SequencedScreenshotOcrClient : IScreenshotOcrClient
+    {
+        private readonly Queue<object> results;
+
+        public SequencedScreenshotOcrClient(params object[] results)
+        {
+            this.results = new Queue<object>(results);
+        }
+
+        public List<string> ScreenshotPaths { get; } = [];
+
+        public Task<ScreenshotOcrResult> ExtractAsync(
+            string screenshotPath,
+            string prompt,
+            MeetingAssistantOptions options,
+            CancellationToken cancellationToken)
+        {
+            ScreenshotPaths.Add(screenshotPath);
+            var result = results.Dequeue();
+            if (result is Exception exception)
+            {
+                throw exception;
+            }
+
+            return Task.FromResult((ScreenshotOcrResult)result);
+        }
+    }
+
+    private sealed class MappingAttendeeCanonicalizer : ISpeakerIdentityAttendeeCanonicalizer
+    {
+        private readonly IReadOnlyDictionary<string, string> aliases;
+
+        public MappingAttendeeCanonicalizer(IReadOnlyDictionary<string, string> aliases)
+        {
+            this.aliases = aliases;
+        }
+
+        public List<IReadOnlyList<string>> Requests { get; } = [];
+
+        public Task<IReadOnlyList<string>> CanonicalizeAsync(
+            IReadOnlyList<string> attendees,
+            CancellationToken cancellationToken)
+        {
+            Requests.Add(attendees.ToList());
+            var result = attendees
+                .Select(attendee => aliases.TryGetValue(attendee, out var canonical) ? canonical : attendee)
+                .Where(attendee => !string.IsNullOrWhiteSpace(attendee))
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+            return Task.FromResult<IReadOnlyList<string>>(result);
         }
     }
 
@@ -336,6 +592,17 @@ public sealed class MeetingScreenshotServiceTests
         bitmap.Save(stream, ImageFormat.Png);
         return stream.ToArray();
     }
+
+    private static string ExtractScreenshotOcrId(string context)
+    {
+        const string prefix = "<!-- screenshot-ocr:";
+        var start = context.IndexOf(prefix, StringComparison.Ordinal);
+        Assert.True(start >= 0);
+        start += prefix.Length;
+        var end = context.IndexOf(" -->", start, StringComparison.Ordinal);
+        Assert.True(end > start);
+        return context[start..end];
+    }
 }
 
 #pragma warning restore CA1416