Refactor: extract duplicated status-pill XAML into a shared QueueStatusPillControl

[JoshuaRowePhantom]

Problem

The fix for #127 adds a status pill (Immediate / Queued / Held) to the group header in AgentChatInputQueueControl.axaml. This creates near-identical structural XAML duplicated across two files:

File	Lines	Binding paths
Controls/QueueComposerControl.axaml	48–82	SetQueueImmediacyCommand, SubmitStatusOption.Label
Controls/AgentChatInputQueueControl.axaml	26–54	SetImmediacyCommand, SelectedImmediacyOption.Label

Both blocks have the same structure: a Border Classes="queue-status-pill dynamic" containing a Button with a MenuFlyout holding three MenuItems (Immediate / Queued / Held), and a StackPanel with a label TextBlock and a caret TextBlock. The only differences are the binding paths and the IsVisible condition.

Because the markup is inlined in two separate files, any future change to the pill's layout, styling tokens, or accessibility attributes must be applied in both places — a fragile maintenance burden.

Design

1. Extract a shared interface IQueueImmediacyViewModel

// Phantom.Workspaces.Agent.Gui/ViewModels/IQueueImmediacyViewModel.cs
namespace Phantom.Workspaces.Agent.Gui.ViewModels;

public interface IQueueImmediacyViewModel
{
    QueueImmediacyOption SelectedImmediacyOption { get; }
    ICommand SetImmediacyCommand { get; }
    QueueImmediacyOption ImmediateImmediacyOption { get; }
    QueueImmediacyOption QueuedImmediacyOption { get; }
    QueueImmediacyOption HeldImmediacyOption { get; }
}

2. Align QueueComposerViewModel to the interface

Rename SubmitStatusOption → SelectedImmediacyOption and SetQueueImmediacyCommand → SetImmediacyCommand so the class satisfies IQueueImmediacyViewModel without adapters. Both InputQueueGroupViewModel and QueueComposerViewModel then share the same public surface for immediacy.

// QueueComposerViewModel — before
public QueueImmediacyOption SubmitStatusOption => ...;
public ICommand SetQueueImmediacyCommand { get; }

// QueueComposerViewModel — after (implements IQueueImmediacyViewModel)
public QueueImmediacyOption SelectedImmediacyOption => ...;
public ICommand SetImmediacyCommand { get; }

InputQueueGroupViewModel already uses the target names — no changes needed there beyond adding IQueueImmediacyViewModel to its implements clause.

3. New QueueStatusPillControl UserControl

<!-- Controls/QueueStatusPillControl.axaml -->
<UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:vm="using:Phantom.Workspaces.Agent.Gui.ViewModels"
             x:Class="Phantom.Workspaces.Agent.Gui.Controls.QueueStatusPillControl"
             x:DataType="vm:IQueueImmediacyViewModel"
             Classes="queue-status-pill dynamic">
    <Button Classes="queue-action-button queue-status-picker-button">
        <Button.Flyout>
            <MenuFlyout Placement="BottomEdgeAlignedLeft">
                <MenuItem Command="{Binding SetImmediacyCommand}"
                          CommandParameter="{Binding ImmediateImmediacyOption}"
                          Header="{Binding ImmediateImmediacyOption}"
                          Classes="queue-immediacy-menu-item"/>
                <MenuItem Command="{Binding SetImmediacyCommand}"
                          CommandParameter="{Binding QueuedImmediacyOption}"
                          Header="{Binding QueuedImmediacyOption}"
                          Classes="queue-immediacy-menu-item"/>
                <MenuItem Command="{Binding SetImmediacyCommand}"
                          CommandParameter="{Binding HeldImmediacyOption}"
                          Header="{Binding HeldImmediacyOption}"
                          Classes="queue-immediacy-menu-item"/>
            </MenuFlyout>
        </Button.Flyout>
        <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
            <TextBlock Text="{Binding SelectedImmediacyOption.Label}"
                       Classes="queue-immediacy-label queue-status-label"/>
            <TextBlock Text="▾"
                       Classes="queue-immediacy-caret queue-status-caret"/>
        </StackPanel>
    </Button>
</UserControl>

4. Call-site changes

QueueComposerControl.axaml — replace the inline pill (lines 48–82) with:

<controls:QueueStatusPillControl Grid.Column="2"
                                  DataContext="{Binding}"
                                  IsVisible="{Binding IsDefaultComposer}"/>

AgentChatInputQueueControl.axaml — replace the inline pill (lines 26–54) with:

<controls:QueueStatusPillControl DataContext="{Binding}"
                                  IsVisible="{Binding !IsDefault}"/>

Files to change

File	Change
ViewModels/IQueueImmediacyViewModel.cs	New — shared interface
ViewModels/QueueComposerViewModel.cs	Rename SubmitStatusOption → SelectedImmediacyOption and SetQueueImmediacyCommand → SetImmediacyCommand; add : IQueueImmediacyViewModel
ViewModels/InputQueueGroupViewModel.cs	Add : IQueueImmediacyViewModel to class declaration
Controls/QueueStatusPillControl.axaml	New — extracted pill UserControl
Controls/QueueStatusPillControl.axaml.cs	New — code-behind (empty, standard pattern)
Controls/QueueComposerControl.axaml	Replace inline pill block with <controls:QueueStatusPillControl>
Controls/AgentChatInputQueueControl.axaml	Replace inline pill block with <controls:QueueStatusPillControl>

Tests

Tests in Phantom.Workspaces.Agent.Gui.Tests:

MainWindowAxamlTests

1. QueueStatusPillControl_ContainsSingleDefinitionOfPillMarkup — reads QueueStatusPillControl.axaml and asserts it contains exactly one queue-status-pill class, one SetImmediacyCommand binding, one SelectedImmediacyOption.Label binding, and all three immediacy CommandParameter bindings.
2. QueueComposerControl_StatusPill_UsesQueueStatusPillControl — reads QueueComposerControl.axaml and asserts it references QueueStatusPillControl (not an inline queue-status-pill Border), with IsVisible="{Binding IsDefaultComposer}".
3. AgentChatInputQueueControl_StatusPill_UsesQueueStatusPillControl — reads AgentChatInputQueueControl.axaml and asserts it references QueueStatusPillControl with IsVisible="{Binding !IsDefault}", replacing the old tests added for Bug: non-default queues don't show their status (immediate/queued/held) when composer is collapsed #127.

InputQueueViewModelTests

4. Update SubmitStatusOption references to SelectedImmediacyOption and SetQueueImmediacyCommand references to SetImmediacyCommand in existing tests.

All tests: deterministic, no Task.Delay, no Moq.

[JoshuaRowePhantom]

Amendment — DataTemplate instead of UserControl

After reading the full pill markup in both files, I think a DataTemplate keyed to IQueueImmediacyViewModel is simpler and sufficient — the QueueStatusPillControl UserControl proposal can be withdrawn.

---

Why a UserControl is unnecessary

The pill has no code-behind, no event handlers, and no logic — it is 100% data-bound. The only reason the inline blocks differ is that the two parent VMs use different property names (SubmitStatusOption / SetQueueImmediacyCommand vs SelectedImmediacyOption / SetImmediacyCommand). The original proposal already requires renaming those to a shared interface — once that rename is done the pill's binding paths are identical, and a DataTemplate can do the rest with zero extra C# files.

---

Proposed approach

1. Same interface + VM changes as before (unchanged)

IQueueImmediacyViewModel, the rename in QueueComposerViewModel, and adding the interface to InputQueueGroupViewModel are all still needed — they're prerequisite for any shared pill representation.

2. Replace the new UserControl with a DataTemplate in a resource dictionary

Create Phantom.Workspaces.Agent.Gui/Styles/QueueStyles.axaml as a ResourceDictionary:

<!-- Styles/QueueStyles.axaml -->
<ResourceDictionary xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:vm="using:Phantom.Workspaces.Agent.Gui.ViewModels">

    <DataTemplate x:Key="QueueImmediacyPickerTemplate"
                  DataType="vm:IQueueImmediacyViewModel">
        <Border Classes="queue-status-pill dynamic">
            <Button Classes="queue-action-button queue-status-picker-button">
                <Button.Flyout>
                    <MenuFlyout Placement="BottomEdgeAlignedLeft">
                        <MenuItem Command="{Binding SetImmediacyCommand}"
                                  CommandParameter="{Binding ImmediateImmediacyOption}"
                                  Header="{Binding ImmediateImmediacyOption}"
                                  Classes="queue-immediacy-menu-item"/>
                        <MenuItem Command="{Binding SetImmediacyCommand}"
                                  CommandParameter="{Binding QueuedImmediacyOption}"
                                  Header="{Binding QueuedImmediacyOption}"
                                  Classes="queue-immediacy-menu-item"/>
                        <MenuItem Command="{Binding SetImmediacyCommand}"
                                  CommandParameter="{Binding HeldImmediacyOption}"
                                  Header="{Binding HeldImmediacyOption}"
                                  Classes="queue-immediacy-menu-item"/>
                    </MenuFlyout>
                </Button.Flyout>
                <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
                    <TextBlock Text="{Binding SelectedImmediacyOption.Label}"
                               Classes="queue-immediacy-label queue-status-label"/>
                    <TextBlock Text="▾"
                               Classes="queue-immediacy-caret queue-status-caret"/>
                </StackPanel>
            </Button>
        </Border>
    </DataTemplate>

</ResourceDictionary>

Register it in App.axaml:

<Application.Resources>
    <ResourceDictionary>
        <ResourceDictionary.MergedDictionaries>
            <ResourceInclude Source="avares://Phantom.Workspaces.Agent.Gui/Styles/QueueStyles.axaml"/>
        </ResourceDictionary.MergedDictionaries>
    </ResourceDictionary>
</Application.Resources>

3. Call-site changes — even simpler than a UserControl

QueueComposerControl.axaml — replace the inline Border block (current lines 48–82) with:

<ContentControl Grid.Column="2"
                Content="{Binding}"
                ContentTemplate="{StaticResource QueueImmediacyPickerTemplate}"
                IsVisible="{Binding IsDefaultComposer}"/>

AgentChatInputQueueControl.axaml — replace the inline Border block (current lines 26–54) with:

<ContentControl Content="{Binding}"
                ContentTemplate="{StaticResource QueueImmediacyPickerTemplate}"
                IsVisible="{Binding !IsDefault}"/>

Both ContentControls pass the current VM (which now implements IQueueImmediacyViewModel) as Content; the template takes it from there.

---

Files affected — revised count

File	Change
ViewModels/IQueueImmediacyViewModel.cs	New — same as before
ViewModels/QueueComposerViewModel.cs	Rename properties + add interface — same as before
ViewModels/InputQueueGroupViewModel.cs	Add interface — same as before
Styles/QueueStyles.axaml	New — resource dictionary with the DataTemplate
App.axaml	Merge QueueStyles.axaml into Application.Resources
Controls/QueueComposerControl.axaml	Replace pill block with ContentControl
Controls/AgentChatInputQueueControl.axaml	Replace pill block with ContentControl

The three files from the original proposal that are no longer needed:

• Controls/QueueStatusPillControl.axaml
• Controls/QueueStatusPillControl.axaml.cs

---

Feasibility notes

• Interface DataType in Avalonia: Avalonia resolves DataTemplate by walking the type hierarchy including interfaces, so DataType="vm:IQueueImmediacyViewModel" matches any implementing type. This is supported behaviour.
• Compiled bindings: QueueStyles.axaml sets DataType on the template, giving the Avalonia compiler enough type information to generate compiled bindings for SelectedImmediacyOption.Label, SetImmediacyCommand, etc. — no x:CompileBindings="False" required.
• No code-behind: Unlike a UserControl, a ResourceDictionary needs no .cs counterpart.
• ContentControl visual tree cost: A ContentControl adds one extra element compared to an inline Border. If that matters, the Border inside the template can be promoted to the ContentControl itself via a custom ControlTemplate on the ContentControl — but in practice the extra element is negligible here.

---

In short: withdraw QueueStatusPillControl as a UserControl; replace it with QueueStyles.axaml + ContentControl at both call sites. The interface and VM alignment work is identical either way.

[JoshuaRowePhantom]

Design

Adopting the DataTemplate approach from the amendment comment (supersedes the UserControl proposal).

Root cause

Two AXAML files contain structurally-identical status-pill markup with different binding paths because QueueComposerViewModel uses SubmitStatusOption/SetQueueImmediacyCommand while InputQueueGroupViewModel uses SelectedImmediacyOption/SetImmediacyCommand.

Approach

1. IQueueImmediacyViewModel interface (new) - declares the shared surface: SelectedImmediacyOption, SetImmediacyCommand, ImmediateImmediacyOption, QueuedImmediacyOption, HeldImmediacyOption.
2. QueueComposerViewModel - rename SubmitStatusOption -> SelectedImmediacyOption and SetQueueImmediacyCommand -> SetImmediacyCommand; add IQueueImmediacyViewModel.
3. InputQueueGroupViewModel - add IQueueImmediacyViewModel to implements clause.
4. Styles/QueueStyles.axaml (new ResourceDictionary) - DataTemplate x:Key="QueueImmediacyPickerTemplate" typed to IQueueImmediacyViewModel.
5. App.axaml - add Application.Resources merging QueueStyles.axaml.
6. QueueComposerControl.axaml - replace inline Border pill with ContentControl using QueueImmediacyPickerTemplate, IsVisible="{Binding IsDefaultComposer}".
7. AgentChatInputQueueControl.axaml - replace inline Border pill with ContentControl using QueueImmediacyPickerTemplate, IsVisible="{Binding !IsDefault}".

Files that will change

• ViewModels/IQueueImmediacyViewModel.cs (New)
• ViewModels/QueueComposerViewModel.cs (Rename two properties + add interface)
• ViewModels/InputQueueGroupViewModel.cs (Add interface)
• Styles/QueueStyles.axaml (New)
• App.axaml (Add Application.Resources)
• Controls/QueueComposerControl.axaml (Replace pill with ContentControl)
• Controls/AgentChatInputQueueControl.axaml (Replace pill with ContentControl)
• Tests/MainWindowAxamlTests.cs (Add/update tests)
• Tests/InputQueueViewModelTests.cs (Update SubmitStatusOption -> SelectedImmediacyOption)

[JoshuaRowePhantom]

Tests

Phantom.Workspaces.Agent.Gui.Tests — MainWindowAxamlTests

1. QueueStyles_ContainsQueueImmediacyPickerTemplateWithAllBindings

   • Reads Styles/QueueStyles.axaml
   • Asserts: contains x:Key="QueueImmediacyPickerTemplate", DataType references IQueueImmediacyViewModel, all three SetImmediacyCommand bindings, SelectedImmediacyOption.Label binding, and CommandParameter bindings for all three options

2. QueueComposerControl_StatusPill_UsesContentControlWithQueueImmediacyPickerTemplate

   • Reads Controls/QueueComposerControl.axaml
   • Asserts: contains ContentTemplate="{StaticResource QueueImmediacyPickerTemplate}" and IsVisible="{Binding IsDefaultComposer}"
   • Asserts: does NOT contain inline queue-status-pill Border block (no Classes="queue-status-pill dynamic" in that file)

3. AgentChatInputQueueControl_NonDefaultQueueHeader_ContainsStatusPillBoundToSetImmediacyCommand (update existing)

   • Replace inline-binding assertions with: ContentTemplate="{StaticResource QueueImmediacyPickerTemplate}" and IsVisible="{Binding !IsDefault}"
   • The old SetImmediacyCommand and SelectedImmediacyOption.Label bindings now live in QueueStyles.axaml (tested by Bump actions/checkout from 4 to 7 #1 above)

Phantom.Workspaces.Agent.Gui.Tests — InputQueueViewModelTests

4. QueueComposer_SubmitStatusOptionTracksQueueState (update existing)
   • Change queueVm.Composer.SubmitStatusOption.Label -> queueVm.Composer.SelectedImmediacyOption.Label (two assertion lines)

All tests: deterministic, no Task.Delay, no Moq.

[JoshuaRowePhantom]

Verification passed

Checked: Commit f5794e5 (eat/queue-immediacy-datatemplate) on the eatures branch, which references this issue.

Files inspected:

• ViewModels/IQueueImmediacyViewModel.cs — interface present with all 5 required members (SelectedImmediacyOption, SetImmediacyCommand, ImmediateImmediacyOption, QueuedImmediacyOption, HeldImmediacyOption)
• ViewModels/QueueComposerViewModel.cs — SubmitStatusOption renamed to SelectedImmediacyOption, SetQueueImmediacyCommand renamed to SetImmediacyCommand, implements IQueueImmediacyViewModel
• ViewModels/InputQueueGroupViewModel.cs — implements IQueueImmediacyViewModel
• Styles/QueueStyles.axaml — ResourceDictionary with DataTemplate x:Key="QueueImmediacyPickerTemplate" typed to IQueueImmediacyViewModel; all three SetImmediacyCommand bindings and SelectedImmediacyOption.Label binding present
• App.axaml — QueueStyles.axaml merged into Application.Resources
• Controls/QueueComposerControl.axaml — inline pill replaced with ContentControl using QueueImmediacyPickerTemplate, IsVisible="{Binding IsDefaultComposer}"
• Controls/AgentChatInputQueueControl.axaml — inline pill replaced with ContentControl using QueueImmediacyPickerTemplate, IsVisible="{Binding !IsDefault}"
• Tests/MainWindowAxamlTests.cs — three tests present: QueueStyles_ContainsQueueImmediacyPickerTemplateWithAllBindings, QueueComposerControl_StatusPill_UsesContentControlWithQueueImmediacyPickerTemplate, and updated AgentChatInputQueueControl_NonDefaultQueueHeader_ContainsStatusPillBoundToSetImmediacyCommand
• Tests/InputQueueViewModelTests.cs — all SubmitStatusOption references updated to SelectedImmediacyOption

Result: Implementation found, all verification criteria satisfied, tests present. No disabled tests, no unresolved TODOs, no timing-dependent tests.