ADR-142: Introduce modal message service with FIFO queuing by Copilot · Pull Request #99 · jodavis/AdaptiveRemote

Copilot · 2026-02-24T00:39:55Z

Implements a dedicated modal message service to decouple message display from ConversationController, enabling both conversation and future programming messages to share a single, properly queued overlay UI.

New: `IModalMessageService` + `ModalMessageService`

Channel-based FIFO queue — single background reader processes one message at a time
keepAlive flag keeps the message visible after the body completes (used for confirmation prompts that need to remain while awaiting spoken response)
cancellationToken is stored per-request and forwarded to the body; OperationCanceledException produces a Canceled (not Faulted) task

await _modalMessageService.ShowMessageAsync(
    phrase,
    ct => _speechSynthesis.SayAsync(phrase, ct),
    keepAlive: isAsking && isLastPhrase);

New: `ModalMessageView` (MvvmObject)

Holds CurrentMessage : string?, consistent with the existing ConversationView MVVM pattern. Registered as a Singleton alongside IModalMessageService, with ModalMessageView injected into ModalMessageService via constructor.

New: `ModalMessageUI.razor`

Extracted into its own component (rendered from Remote.razor) since the modal is no longer specific to conversation. ConversationUI.razor is simplified to only handle conversation status and the listening border.

Removed: `ConversationView.SpeakingMessage`

The conversation-speaking-message CSS class is preserved; it is now rendered by ModalMessageUI.razor bound to ModalMessageView.CurrentMessage.

Tests

12 synchronous unit tests in ModalMessageServiceTests (all [TestMethod] void) covering:
- FIFO ordering and task-not-complete-while-body-runs
- Keep-alive/message replacement
- Markdown verbatim preservation
- Fault recovery
- PropertyChanged notification
- Cancellation: token passed to body, message cleared, task in Canceled state, queue unblocked after cancellation
ConversationControllerTests updated: Expect_Synthesis_Say also wires the modal message mock so synthesis expectations implicitly verify the service is called with the correct phrase

🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.

Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

jodavis

@copilot Please review these comments and make the necessary changes.

jodavis · 2026-02-24T02:44:38Z

src/AdaptiveRemote.App/Components/ConversationUI.razor

 }

-@if (SpeakingMessage is not null)
+@if (CurrentMessage is not null)


This should be moved to a different view component, since it's no longer specifically part of the Conversation UI.

Done in edebe56. Created ModalMessageUI.razor with the modal rendering, added it to Remote.razor, and removed it from ConversationUI.razor.

jodavis · 2026-02-24T17:36:54Z

src/AdaptiveRemote.App/Configuration/ConversationHostBuilderExtensions.cs

+            .AddScoped<ModalMessageService>()
+            .AddScoped<IModalMessageService>(sp => sp.GetRequiredService<ModalMessageService>())
+            .AddScoped<Models.ModalMessageView>(sp => sp.GetRequiredService<ModalMessageService>().View);


Suggested change

.AddScoped<ModalMessageService>()

.AddScoped<IModalMessageService>(sp => sp.GetRequiredService<ModalMessageService>())

.AddScoped<Models.ModalMessageView>(sp => sp.GetRequiredService<ModalMessageService>().View);

.AddSingleton<IModalMessageService, ModalMessageService>()

.AddSingleton<Models.ModalMessageView>();

If ModalMessageService accepts the view as a constructor parameter, we can simplify the configuration of these services.

Also, these services should be Singletons, since (a) they don't have any configuration that can change, and (b) they are tied to the UI, so the UI could be holding onto the view.

Done in edebe56. ModalMessageService now accepts ModalMessageView via its constructor, and both are registered as Singletons:

.AddSingleton<Models.ModalMessageView>() .AddSingleton<IModalMessageService, ModalMessageService>()

test/AdaptiveRemote.App.Tests/Services/ModalMessages/ModalMessageServiceTests.cs

jodavis · 2026-02-24T17:49:22Z

test/AdaptiveRemote.App.Tests/Services/ModalMessages/ModalMessageServiceTests.cs

+    }
+
+    [TestMethod]
+    public async Task ShowMessageAsync_KeepAlive_ViewModelRaisesPropertyChangedAsync()


This isn't testing keepAlive, but the method name suggests it is.

Fixed in edebe56 — renamed to ShowMessageAsync_ViewModelRaisesPropertyChanged.

jodavis · 2026-02-24T17:52:20Z

test/AdaptiveRemote.App.Tests/Services/ModalMessages/ModalMessageServiceTests.cs

+    [TestMethod]
+    public async Task ShowMessageAsync_SingleMessage_SetsAndClearsCurrentMessageAsync()
+    {
+        // Arrange
+        using ModalMessageService sut = CreateSut();
+        string? messageWhileRunning = null;
+
+        // Act
+        await sut.ShowMessageAsync("Hello", async _ =>
+        {
+            messageWhileRunning = sut.View.CurrentMessage;
+            await Task.CompletedTask;
+        });
+
+        // Assert
+        messageWhileRunning.Should().Be("Hello", because: "message should be visible while body runs");
+        sut.View.CurrentMessage.Should().BeNull(because: "message should be cleared after body completes");
+    }


Add a case that verifies the message stays set and the ShowMessageAsync task doesn't complete, until the body method completes.

Added in edebe56 as ShowMessageAsync_WhileBodyRunning_TaskIsNotComplete. It uses a TaskCompletionSource to block the body, then asserts showTask.Should().NotBeComplete() and View.CurrentMessage.Should().Be("Hello") before unblocking.

jodavis · 2026-02-24T17:56:56Z

test/AdaptiveRemote.App.Tests/Services/ModalMessages/ModalMessageServiceTests.cs

+        secondMessageSeen.Should().Be("Second", because: "the queue should continue processing after a faulted body");
+        sut.View.CurrentMessage.Should().BeNull();
+    }
+


Add a cases for cancellation -- verify the token is passed to the body message, the message value is cleared, the ShowMessageAsync method returns cancelled, and the next method call is unblocked. (These don't all have to be separate tests, but all the behaviors should be covered.)

Added in edebe56 as three tests:

ShowMessageAsync_Cancellation_TokenIsPassedToBody — captures the token in the body and verifies IsCancellationRequested changes when cts.Cancel() is called

ShowMessageAsync_Cancellation_ClearsMessageAndReturnsCancelled — verifies View.CurrentMessage is null and the task is BeCanceled

ShowMessageAsync_Cancellation_SubsequentMessageStillShows — verifies the queue continues processing after a cancelled entry

Also updated ModalMessageService.ProcessQueueAsync to call TrySetCanceled (not TrySetException) when the body throws OperationCanceledException due to the request's cancellation token.

…tests, cancellation tests Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

Copilot · 2026-02-24T18:52:17Z

@copilot Please review these comments and make the necessary changes.

All six comments addressed in edebe56. Summary of changes:

ModalMessageUI.razor (new) — extracted modal message rendering
Remote.razor — hosts <ModalMessageUI />
ConversationUI.razor — modal rendering removed
ModalMessageService — constructor-injected ModalMessageView, OperationCanceledException → TrySetCanceled
ConversationHostBuilderExtensions — Singleton registration via DI constructor injection
ModalMessageServiceTests — fully synchronous, all new test cases added

* Implement ADR-142: Modal message service with FIFO queuing * Fix: propagate cancellationToken to body in ModalMessageService * Address PR review: extract ModalMessageUI, Singleton DI, synchronous tests, cancellation tests --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

Initial plan

dae2a94

Copilot AI assigned Copilot and jodavis Feb 24, 2026

Copilot started work on behalf of jodavis February 24, 2026 00:40 View session

Copilot AI and others added 2 commits February 24, 2026 01:07

Implement ADR-142: Modal message service with FIFO queuing

bfe768d

Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

Fix: propagate cancellationToken to body in ModalMessageService

85eb369

Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Implement task ADR-142 from ProgrammableCommands~~ ADR-142: Introduce modal message service with FIFO queuing Feb 24, 2026

Copilot AI requested a review from jodavis February 24, 2026 01:22

Copilot finished work on behalf of jodavis February 24, 2026 01:22

jodavis requested changes Feb 24, 2026

View reviewed changes

Copilot started work on behalf of jodavis February 24, 2026 18:23 View session

Address PR review: extract ModalMessageUI, Singleton DI, synchronous …

edebe56

…tests, cancellation tests Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>

Copilot AI requested a review from jodavis February 24, 2026 18:52

Copilot finished work on behalf of jodavis February 24, 2026 18:52

jodavis approved these changes Feb 24, 2026

View reviewed changes

jodavis marked this pull request as ready for review February 24, 2026 22:30

jodavis merged commit b6c437e into dev/jodavis/ADR-128-spec-programmable-ir-commands Feb 24, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ADR-142: Introduce modal message service with FIFO queuing#99

ADR-142: Introduce modal message service with FIFO queuing#99
jodavis merged 4 commits intodev/jodavis/ADR-128-spec-programmable-ir-commandsfrom
copilot/implement-adr-142-task

Copilot AI commented Feb 24, 2026 •

edited

Loading

Uh oh!

jodavis left a comment

Uh oh!

jodavis Feb 24, 2026

Uh oh!

Copilot AI Feb 24, 2026

Uh oh!

jodavis Feb 24, 2026

Uh oh!

Copilot AI Feb 24, 2026

Uh oh!

Uh oh!

jodavis Feb 24, 2026

Uh oh!

Copilot AI Feb 24, 2026

Uh oh!

jodavis Feb 24, 2026

Uh oh!

Copilot AI Feb 24, 2026

Uh oh!

jodavis Feb 24, 2026

Uh oh!

Copilot AI Feb 24, 2026

Uh oh!

Copilot AI commented Feb 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Copilot AI commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

New: IModalMessageService + ModalMessageService

New: ModalMessageView (MvvmObject)

New: ModalMessageUI.razor

Removed: ConversationView.SpeakingMessage

Tests

Uh oh!

jodavis left a comment

Choose a reason for hiding this comment

Uh oh!

jodavis Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

jodavis Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jodavis Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

jodavis Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

jodavis Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Feb 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented Feb 24, 2026 •

edited

Loading

New: `IModalMessageService` + `ModalMessageService`

New: `ModalMessageView` (MvvmObject)

New: `ModalMessageUI.razor`

Removed: `ConversationView.SpeakingMessage`