From 0d4f359329d4e9049a7605aabc76f4bf1031a9d2 Mon Sep 17 00:00:00 2001
From: Norton Andreev <norton@nortonandreev.com>
Date: Mon, 14 Sep 2026 20:12:53 +0600
Subject: [PATCH 1/2] Show one live question as a row in the chat

---
 src/Capacitor.App/App.axaml                   |  13 +-
 .../Services/PendingPermissionRequest.cs      |  21 +++
 .../Services/PermissionService.cs             |  25 ++++
 src/Capacitor.App/ViewModels/ChatItems.cs     |  16 ++-
 .../ViewModels/ChatTabViewModel.cs            |  39 +++++-
 src/Capacitor.App/Views/ChatTabView.axaml     |  53 ++++----
 src/Capacitor.App/Views/ChatTabView.axaml.cs  |  12 ++
 .../Views/PendingCardTemplates.axaml          |  31 +++--
 .../ChatTabViewModelTests.cs                  |  65 +++++++++
 .../ChatTabViewSmokeTests.cs                  | 126 ++++++++++++++++--
 .../PermissionServiceTests.cs                 |  91 +++++++++++++
 11 files changed, 443 insertions(+), 49 deletions(-)

diff --git a/src/Capacitor.App/App.axaml b/src/Capacitor.App/App.axaml
index 90d834ceb..fa1da5c7d 100644
--- a/src/Capacitor.App/App.axaml
+++ b/src/Capacitor.App/App.axaml
@@ -76,9 +76,15 @@
              ring and fill would read as a second box. Fluent's default placeholder follows the
              system theme and goes near-black on our dark surfaces — pin a readable muted tone. -->
         <Style Selector="TextBox.kcapEmbedded">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{StaticResource KcapTextBrush}" />
+            <Setter Property="CaretBrush" Value="{StaticResource KcapTextBrush}" />
+            <Setter Property="BorderThickness" Value="0" />
             <Setter Property="PlaceholderForeground" Value="{StaticResource KcapMutedBrush}" />
         </Style>
-        <Style Selector="TextBox.kcapEmbedded:focus /template/ Border#PART_BorderElement, TextBox.kcapEmbedded:pointerover /template/ Border#PART_BorderElement">
+        <Style Selector="TextBox.kcapEmbedded /template/ Border#PART_BorderElement,
+                         TextBox.kcapEmbedded:focus /template/ Border#PART_BorderElement,
+                         TextBox.kcapEmbedded:pointerover /template/ Border#PART_BorderElement">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderThickness" Value="0" />
         </Style>
@@ -378,6 +384,11 @@
         <Style Selector="Border.attachTarget.dragOver">
             <Setter Property="BorderBrush" Value="{StaticResource KcapPrimaryBrush}" />
         </Style>
+        <Style Selector="TextBlock.toolKindChip">
+            <Setter Property="FontSize" Value="10" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Foreground" Value="{StaticResource KcapMutedBrush}" />
+        </Style>
         <!-- Live tool-call status: a soft pulse so an in-flight row is never a blank gap. -->
         <Style Selector="Border.toolRunning">
             <Style.Animations>
diff --git a/src/Capacitor.App/Services/PendingPermissionRequest.cs b/src/Capacitor.App/Services/PendingPermissionRequest.cs
index 1045f3de3..ca8ab588b 100644
--- a/src/Capacitor.App/Services/PendingPermissionRequest.cs
+++ b/src/Capacitor.App/Services/PendingPermissionRequest.cs
@@ -100,6 +100,27 @@ static PendingPermissionRequest FromReconciledClaude(string sessionId, PendingIn
     internal long LiveSequence { get; set; }
     public bool IsQuestion => Questions is not null || AcpQuestion is not null;
 
+    /// Local AskUserQuestion and the hub elicitation share no id until the daemon maps them;
+    /// same session plus overlapping question text is the join. Permission prompts never match.
+    internal bool SameQuestionAs(PendingPermissionRequest other) {
+        if (!IsQuestion || !other.IsQuestion) return false;
+        if (!string.Equals(SessionId, other.SessionId, StringComparison.Ordinal)) return false;
+        return QuestionFingerprints().ToHashSet(StringComparer.Ordinal).Overlaps(other.QuestionFingerprints());
+    }
+
+    IEnumerable<string> QuestionFingerprints() {
+        if (AcpQuestion?.Prompt?.Trim() is { Length: > 0 } prompt)
+            yield return prompt;
+        if (Questions is not { Questions.Length: > 0 } parsed) yield break;
+        var question = parsed.Questions[0].Question.Trim();
+        if (question.Length == 0) yield break;
+        yield return question;
+        if (parsed.Questions[0].Header is { Length: > 0 } header) {
+            yield return $"{header}\n{question}";
+            yield return $"{header}\n\n{question}";
+        }
+    }
+
     static DateTimeOffset ParseTime(string s) =>
         DateTimeOffset.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var t) ? t : DateTimeOffset.MinValue;
 }
diff --git a/src/Capacitor.App/Services/PermissionService.cs b/src/Capacitor.App/Services/PermissionService.cs
index c28015984..9fd9106c6 100644
--- a/src/Capacitor.App/Services/PermissionService.cs
+++ b/src/Capacitor.App/Services/PermissionService.cs
@@ -245,6 +245,7 @@ void UpsertLocal(PermissionPendingDto dto) {
             var item = new PendingPermissionRequest(dto);
             _cache.AddOrUpdate(item);
             Shadow(dto.ServerRequestId);
+            ShadowMatchingServerQuestions(item);
         }
     }
 
@@ -258,6 +259,29 @@ void Shadow(string? serverRequestId) {
     // Caller holds _lock.
     bool IsClaimed(string serverRequestId) => _cache.Items.Any(i => i.Lane == PermissionLane.Local && i.ServerRequestId == serverRequestId);
 
+    // Caller holds _lock. Prompt-text join: the daemon has not yet written ServerRequestId.
+    void ShadowMatchingServerQuestions(PendingPermissionRequest local) {
+        if (!local.IsQuestion) return;
+        foreach (var twin in _cache.Items.Where(i => i.Lane == PermissionLane.Server && local.SameQuestionAs(i)).ToList())
+            ShadowTwin(local, twin);
+    }
+
+    // Caller holds _lock. The twin may already be in the cache or only arriving now.
+    void ShadowTwin(PendingPermissionRequest local, PendingPermissionRequest twin) {
+        if (local.ServerRequestId is null) {
+            local.ServerRequestId = twin.RequestId;
+            _cache.Refresh(local);
+        }
+        _shadowed[twin.Key] = twin;
+        _cache.Remove(twin.Key);
+    }
+
+    // Caller holds _lock.
+    PendingPermissionRequest? LocalQuestionClaimant(PendingPermissionRequest server) {
+        if (!server.IsQuestion) return null;
+        return _cache.Items.FirstOrDefault(i => i.Lane == PermissionLane.Local && i.SameQuestionAs(server));
+    }
+
     void DropLocalLane() {
         lock (_lock) {
             if (_disposed) return;
@@ -303,6 +327,7 @@ internal void UpsertServer(PendingPermissionRequest item) {
             item.AgentId = _sessionAgents.GetValueOrDefault(item.SessionId, "");
             item.LiveSequence = ++_liveSequence;
             if (IsClaimed(item.RequestId)) { _shadowed[item.Key] = item; return; }
+            if (LocalQuestionClaimant(item) is { } claimant) { ShadowTwin(claimant, item); return; }
             if (_cache.Lookup(item.Key) is { HasValue: true, Value: var live }) {
                 live.LiveSequence = item.LiveSequence; // a live card keeps its instance, not its stamp
                 return;
diff --git a/src/Capacitor.App/ViewModels/ChatItems.cs b/src/Capacitor.App/ViewModels/ChatItems.cs
index 685c15367..91fd0f380 100644
--- a/src/Capacitor.App/ViewModels/ChatItems.cs
+++ b/src/Capacitor.App/ViewModels/ChatItems.cs
@@ -5,7 +5,7 @@
 
 namespace Capacitor.App.ViewModels;
 
-/// One row of the Chat tab. Five shapes, matched by DataTemplates on the concrete type.
+/// One row of the Chat tab. Matched by DataTemplates on the concrete type.
 public abstract class ChatItemViewModel : ReactiveObject { }
 
 public sealed class UserTurnItem(string text) : ChatItemViewModel {
@@ -143,6 +143,14 @@ public string SummaryLine {
     bool _hasFailure;
     public bool HasFailure { get => _hasFailure; private set => this.RaiseAndSetIfChanged(ref _hasFailure, value); }
 
+    bool _packsWithCard;
+    /// A live card answering this group sits in the next row; the view drops the paragraph gap
+    /// so the two read as one block.
+    public bool PacksWithCard {
+        get => _packsWithCard;
+        set => this.RaiseAndSetIfChanged(ref _packsWithCard, value);
+    }
+
     public ToolGroupItem() {
         ToggleCommand = ReactiveCommand.Create(Toggle);
     }
@@ -194,3 +202,9 @@ void Recompute() {
         return text.Length <= cap ? text : text[..(cap - 1)] + "…";
     }
 }
+
+/// A live prompt card sitting in the transcript list so it virtualizes with the thread.
+public sealed class PendingCardItem(PendingCardViewModel card, bool packsWithPrevious = false) : ChatItemViewModel {
+    public PendingCardViewModel Card { get; } = card;
+    public bool PacksWithPrevious { get; } = packsWithPrevious;
+}
diff --git a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
index 3148f24bf..73844665f 100644
--- a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
+++ b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
@@ -121,7 +121,7 @@ private set {
         }
     }
 
-    public string PhaseNote => Phase switch {
+    public string PhaseNote => _items.Count > 0 ? "" : Phase switch {
         ChatTabPhase.Waiting     => "Waiting for the transcript…",
         ChatTabPhase.Missing     => _missingNote ?? "The transcript file is missing",
         ChatTabPhase.Unavailable => _unavailableNote ?? "No chat view for this harness",
@@ -361,6 +361,7 @@ public ChatTabViewModel(
                     }
                 }
                 Reconcile();
+                SyncPendingCardItems();
             })
             .DisposeWith(_disposables);
 
@@ -550,6 +551,7 @@ void SwitchFeed(string key, Func<string, IChatTranscriptFeed> open) {
         // The rows are gone, so the view has to re-read what stands in for them even when the phase
         // is unchanged — and only then, since the setter itself raises the note on a real change.
         if (wasWaiting) this.RaisePropertyChanged(nameof(PhaseNote));
+        SyncPendingCardItems();
         OnTick();
     }
 
@@ -649,6 +651,7 @@ void Apply(int generation, FeedRead read) {
             queued.Rebase(_inputGeneration, read.SnapshotOffset ?? CurrentOffset ?? 0);
         RefreshQueue();
         if (read.Lines.Count == 0) {
+            SyncPendingCardItems();
             RefreshActivityNote();
             return;
         }
@@ -699,9 +702,43 @@ void Apply(int generation, FeedRead read) {
         if (fresh.Count > 0) _items.AddRange(fresh);
         RefreshQueue();
         Reconcile();
+        SyncPendingCardItems();
         RefreshActivityNote();
     }
 
+    /// Cards ride the same virtualizing list as the thread, always last, so a path switch or a
+    /// transcript reset cannot bury them in the middle of replayed rows.
+    void SyncPendingCardItems() {
+        var cards = PendingCards;
+        var start = _items.Count;
+        while (start > 0 && _items[start - 1] is PendingCardItem) start--;
+        if (TrailingCardsMatch(start, cards)) return;
+
+        if (start > 0 && _items[start - 1] is ToolGroupItem previous)
+            previous.PacksWithCard = false;
+
+        var wasEmpty = _items.Count == 0;
+        for (var i = _items.Count - 1; i >= 0; i--)
+            if (_items[i] is PendingCardItem) _items.RemoveAt(i);
+
+        var packs = cards.Count > 0 && _items.Count > 0 && _items[^1] is ToolGroupItem;
+        if (packs) ((ToolGroupItem)_items[^1]).PacksWithCard = true;
+        var first = true;
+        foreach (var card in cards) {
+            _items.Add(new PendingCardItem(card, packsWithPrevious: first && packs));
+            first = false;
+        }
+        if (wasEmpty != (_items.Count == 0))
+            this.RaisePropertyChanged(nameof(PhaseNote));
+    }
+
+    bool TrailingCardsMatch(int start, ReadOnlyObservableCollection<PendingCardViewModel> cards) {
+        if (_items.Count - start != cards.Count) return false;
+        for (var i = 0; i < cards.Count; i++)
+            if (!ReferenceEquals(((PendingCardItem)_items[start + i]).Card, cards[i])) return false;
+        return true;
+    }
+
     /// A row is marked iff some pending request targets it: by tool-use id when the request has
     /// one, else the sole running call. Recomputed whole on every change to either set and diffed
     /// against the last marks, because a settled call has already left _pendingTools by the time
diff --git a/src/Capacitor.App/Views/ChatTabView.axaml b/src/Capacitor.App/Views/ChatTabView.axaml
index 690754197..67ec4d485 100644
--- a/src/Capacitor.App/Views/ChatTabView.axaml
+++ b/src/Capacitor.App/Views/ChatTabView.axaml
@@ -4,7 +4,21 @@
              xmlns:views="clr-namespace:Capacitor.App.Views"
              x:Class="Capacitor.App.Views.ChatTabView"
              x:DataType="vm:ChatTabViewModel">
-    <Grid RowDefinitions="*,Auto,Auto,Auto,Auto">
+    <UserControl.Styles>
+        <Style Selector="Border.toolGroup">
+            <Setter Property="Margin" Value="0,4,0,22" />
+        </Style>
+        <Style Selector="Border.toolGroup.packsWithCard">
+            <Setter Property="Margin" Value="0,4,0,4" />
+        </Style>
+        <Style Selector="ContentControl.pendingCard">
+            <Setter Property="Margin" Value="0,8,0,12" />
+        </Style>
+        <Style Selector="ContentControl.pendingCard.packsWithPrevious">
+            <Setter Property="Margin" Value="0,4,0,12" />
+        </Style>
+    </UserControl.Styles>
+    <Grid RowDefinitions="*,Auto,Auto,Auto">
         <!-- The template owns the ScrollViewer: that is the shape Avalonia virtualizes. An
              ItemsControl inside an external ScrollViewer is measured at infinite height. -->
         <ItemsControl x:Name="ChatItems" Grid.Row="0" ItemsSource="{Binding Items}">
@@ -76,7 +90,8 @@
                 <DataTemplate x:DataType="vm:ToolGroupItem">
                     <!-- Stretch to the chat column (capped like assistant text) so lone cards are
                          not content-width pills. -->
-                    <Border MaxWidth="660" MinWidth="320" Margin="0,4,0,22" Padding="12,10" CornerRadius="10"
+                    <Border Classes="toolGroup" Classes.packsWithCard="{Binding PacksWithCard}"
+                            MaxWidth="660" MinWidth="320" Padding="12,10" CornerRadius="10"
                             Background="{StaticResource KcapSurfaceBrush}"
                             BorderBrush="{StaticResource KcapBorderBrush}" BorderThickness="1"
                             HorizontalAlignment="Stretch">
@@ -85,8 +100,6 @@
                                  Plain text (no chip chrome) so it lines up with the detail. -->
                             <Grid ColumnDefinitions="*,Auto" IsVisible="{Binding ShowsKindChip}">
                                 <TextBlock Classes="toolKindChip" Text="{Binding KindChip}"
-                                           FontSize="10" FontWeight="SemiBold"
-                                           Foreground="{StaticResource KcapMutedBrush}"
                                            VerticalAlignment="Center" />
                                 <Panel Grid.Column="1" DataContext="{Binding LoneCall}" VerticalAlignment="Center">
                                     <Border Classes="toolStatus" Width="14" Height="8" CornerRadius="4"
@@ -123,6 +136,16 @@
                         </StackPanel>
                     </Border>
                 </DataTemplate>
+                <DataTemplate x:DataType="vm:PendingCardItem">
+                    <ContentControl Classes="pendingCard" Classes.packsWithPrevious="{Binding PacksWithPrevious}"
+                                    Content="{Binding Card}" MaxWidth="660" HorizontalAlignment="Stretch">
+                        <ContentControl.DataTemplates>
+                            <StaticResource ResourceKey="PermissionCardTemplate" />
+                            <StaticResource ResourceKey="QuestionCardTemplate" />
+                            <StaticResource ResourceKey="AcpQuestionCardTemplate" />
+                        </ContentControl.DataTemplates>
+                    </ContentControl>
+                </DataTemplate>
             </ItemsControl.DataTemplates>
         </ItemsControl>
 
@@ -139,22 +162,7 @@
                        VerticalAlignment="Center" />
         </StackPanel>
 
-        <Border x:Name="NeedsYouRow" Grid.Row="2" Margin="22,0,22,4" IsVisible="{Binding HasPendingCards}">
-            <StackPanel Spacing="6">
-                <TextBlock Text="NEEDS YOU" FontSize="10" FontWeight="SemiBold" Foreground="{StaticResource KcapMutedBrush}" />
-                <ScrollViewer MaxHeight="420" VerticalScrollBarVisibility="Auto">
-                    <ItemsControl ItemsSource="{Binding PendingCards}">
-                        <ItemsControl.DataTemplates>
-                            <StaticResource ResourceKey="PermissionCardTemplate" />
-                            <StaticResource ResourceKey="QuestionCardTemplate" />
-                            <StaticResource ResourceKey="AcpQuestionCardTemplate" />
-                        </ItemsControl.DataTemplates>
-                    </ItemsControl>
-                </ScrollViewer>
-            </StackPanel>
-        </Border>
-
-        <Border x:Name="QueuedMessagesBanner" Grid.Row="3" Margin="22,4,22,0" Padding="13,10"
+        <Border x:Name="QueuedMessagesBanner" Grid.Row="2" Margin="22,4,22,0" Padding="13,10"
                 Background="{StaticResource KcapSurfaceBrush}" BorderBrush="{StaticResource KcapBorderBrush}"
                 BorderThickness="1" CornerRadius="8" IsVisible="{Binding HasQueuedMessages}">
             <StackPanel Spacing="6">
@@ -180,15 +188,14 @@
             </StackPanel>
         </Border>
 
-        <Border x:Name="ComposerCard" Classes="attachTarget" Grid.Row="4" Margin="22,8,22,18"
+        <Border x:Name="ComposerCard" Classes="attachTarget" Grid.Row="3" Margin="22,8,22,18"
                 Background="{StaticResource KcapSurfaceBrush}"
                 BorderThickness="1" CornerRadius="10" Padding="13,12">
             <StackPanel Spacing="6">
                 <views:AttachmentChipStrip x:Name="ChipStrip" Tray="{Binding Tray}"
                                            IsVisible="{Binding Tray.HasAttachments}" />
                 <TextBox x:Name="ComposerInput" Classes="kcapEmbedded" Text="{Binding ComposerText}" AcceptsReturn="True" TextWrapping="Wrap"
-                         MinHeight="38" MaxHeight="160" Background="Transparent" BorderThickness="0"
-                         PlaceholderText="Write a message" IsVisible="{Binding ShowsComposer}" />
+                         MinHeight="38" MaxHeight="160" PlaceholderText="Write a message" IsVisible="{Binding ShowsComposer}" />
                 <!-- A flow participant is addressed through the flow protocol, never messaged
                      directly, so the banner replaces the input rather than overlaying a dead one. -->
                 <Border x:Name="ReadOnlyBanner" IsVisible="{Binding IsReadOnlyParticipant}"
diff --git a/src/Capacitor.App/Views/ChatTabView.axaml.cs b/src/Capacitor.App/Views/ChatTabView.axaml.cs
index 7ff56a54c..42ba1d01d 100644
--- a/src/Capacitor.App/Views/ChatTabView.axaml.cs
+++ b/src/Capacitor.App/Views/ChatTabView.axaml.cs
@@ -71,6 +71,9 @@ protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e
     }
 
     void OnReaderGesture(object? sender, RoutedEventArgs e) {
+        // A TextBox in the list (Other…, free-text) is editing, not reading: arming follow-tail
+        // would ScrollToEnd and recycle its virtualizing row, which drops the caret.
+        if (OriginatesFromTextBox(e)) return;
         if (_readerGesture) return;
         _readerGesture = true;
         Dispatcher.UIThread.Post(() => _readerGesture = false, DispatcherPriority.Background);
@@ -78,11 +81,20 @@ void OnReaderGesture(object? sender, RoutedEventArgs e) {
 
     void OnScrollChanged(object? sender, ScrollChangedEventArgs e) {
         if (sender is not ScrollViewer scroll) return;
+        if (ListTextBoxOwnsFocus()) return;
         var atBottom = scroll.Offset.Y + scroll.Viewport.Height >= scroll.Extent.Height - BottomTolerance;
         _followTail = _readerGesture ? atBottom : _followTail || atBottom;
         if (_followTail && !atBottom) scroll.ScrollToEnd();
     }
 
+    static bool OriginatesFromTextBox(RoutedEventArgs e) =>
+        e.Source is Visual visual && (visual is TextBox || visual.GetVisualAncestors().OfType<TextBox>().Any());
+
+    bool ListTextBoxOwnsFocus() {
+        if (TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() is not TextBox box) return false;
+        return box.GetVisualAncestors().OfType<ItemsControl>().Any(c => ReferenceEquals(c, ChatItems));
+    }
+
     /// The composer wraps, so the rendered rows, not the newlines, say whether the caret has a row
     /// above or below it; the newline count stands in only before the box has a text presenter.
     (int Line, int Lines) ComposerCaretLine() {
diff --git a/src/Capacitor.App/Views/PendingCardTemplates.axaml b/src/Capacitor.App/Views/PendingCardTemplates.axaml
index b0b30797a..6eb9132a4 100644
--- a/src/Capacitor.App/Views/PendingCardTemplates.axaml
+++ b/src/Capacitor.App/Views/PendingCardTemplates.axaml
@@ -4,7 +4,7 @@
     <!-- The three NEEDS YOU card kinds. Every pane that answers a prompt renders them from here,
          so a card looks and behaves the same whether the agent runs on this machine or another. -->
     <DataTemplate x:Key="PermissionCardTemplate" x:DataType="vm:PermissionCardViewModel">
-        <Border Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapSuccessBrush}"
+        <Border Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapBorderBrush}"
                 BorderThickness="1" CornerRadius="10" Padding="13,10" Margin="0,0,0,6">
             <StackPanel Spacing="6">
                 <TextBlock Text="{Binding ToolName}" FontWeight="SemiBold" FontSize="13" Foreground="{StaticResource KcapTextBrush}" />
@@ -33,9 +33,17 @@
         </Border>
     </DataTemplate>
     <DataTemplate x:Key="QuestionCardTemplate" x:DataType="vm:QuestionCardViewModel">
-        <Border Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapSuccessBrush}"
+        <Border x:Name="QuestionCard"
+                Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapBorderBrush}"
                 BorderThickness="1" CornerRadius="10" Padding="14,12" Margin="0,0,0,6">
             <Border.Styles>
+                <Style Selector="TextBlock.prompt">
+                    <Setter Property="FontWeight" Value="SemiBold" />
+                    <Setter Property="FontSize" Value="15" />
+                    <Setter Property="LineHeight" Value="21" />
+                    <Setter Property="TextWrapping" Value="Wrap" />
+                    <Setter Property="Foreground" Value="{StaticResource KcapTextBrush}" />
+                </Style>
                 <!-- Option chrome lives in class styles only: a local Background/BorderBrush on
                      the Button would outrank the selected style and leave it inert, and the
                      theme's hover fill on PART_ContentPresenter is overridden for the same reason. -->
@@ -131,13 +139,8 @@
                     <ContentControl.ContentTemplate>
                         <DataTemplate x:DataType="vm:QuestionGroupViewModel">
                             <StackPanel Spacing="8">
-                                <Border Background="{StaticResource KcapSurfaceBrush}" CornerRadius="4" Padding="6,2" HorizontalAlignment="Left"
-                                        IsVisible="{Binding ShowsHeader}">
-                                    <TextBlock Text="{Binding Header}" FontSize="11" FontWeight="SemiBold" Foreground="{StaticResource KcapMutedBrush}"
-                                               TextTrimming="CharacterEllipsis" MaxLines="1" />
-                                </Border>
-                                <TextBlock Text="{Binding Text}" FontWeight="SemiBold" FontSize="15" LineHeight="21" TextWrapping="Wrap"
-                                           Foreground="{StaticResource KcapTextBrush}" />
+                                <TextBlock Classes="toolKindChip" Text="{Binding Header}" IsVisible="{Binding ShowsHeader}" />
+                                <TextBlock Classes="prompt" Text="{Binding Text}" />
                                 <ItemsControl ItemsSource="{Binding Options}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
@@ -169,8 +172,8 @@
                                             IsVisible="{Binding ShowsOtherAnswer}" Margin="6,0,0,0"
                                             Padding="12,5" FontSize="13" CornerRadius="7"
                                             Classes="kcapPrimary" Background="{StaticResource KcapPrimaryBrush}" Foreground="{StaticResource KcapOnPrimaryBrush}" />
-                                    <TextBox Text="{Binding OtherText}" PlaceholderText="Other…" MaxLength="{Binding MaxOtherLength}"
-                                             AcceptsReturn="False" FontSize="13" MinHeight="34">
+                                    <TextBox Classes="kcapField" Text="{Binding OtherText}" PlaceholderText="Other…"
+                                             MaxLength="{Binding MaxOtherLength}" AcceptsReturn="False" FontSize="13" MinHeight="34">
                                         <TextBox.KeyBindings>
                                             <KeyBinding Gesture="Enter" Command="{Binding EnterCommand}" />
                                         </TextBox.KeyBindings>
@@ -224,7 +227,7 @@
     </DataTemplate>
     <DataTemplate x:Key="AcpQuestionCardTemplate" x:DataType="vm:AcpQuestionCardViewModel">
         <Border x:Name="AcpQuestionCard"
-                Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapSuccessBrush}"
+                Background="{StaticResource KcapSurfaceRaisedBrush}" BorderBrush="{StaticResource KcapBorderBrush}"
                 BorderThickness="1" CornerRadius="10" Padding="14,12" Margin="0,0,0,6">
             <Border.Styles>
                 <Style Selector="Button.acpOption, ToggleButton.acpOption">
@@ -263,8 +266,8 @@
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
-                <TextBox Text="{Binding FreeText}" PlaceholderText="Type your answer…" IsVisible="{Binding !HasOptions}"
-                         AcceptsReturn="False" FontSize="13" MinHeight="34" />
+                <TextBox Classes="kcapField" Text="{Binding FreeText}" PlaceholderText="Type your answer…"
+                         IsVisible="{Binding !HasOptions}" AcceptsReturn="False" FontSize="13" MinHeight="34" />
                 <TextBlock Text="{Binding ErrorText}" FontSize="12" Foreground="{StaticResource KcapDangerBrush}"
                            IsVisible="{Binding ErrorText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
                 <StackPanel Orientation="Horizontal" Spacing="6" HorizontalAlignment="Right" IsVisible="{Binding ShowsSubmit}">
diff --git a/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs b/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
index e580c6f72..9355627b2 100644
--- a/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
@@ -37,6 +37,7 @@ static AgentStatusDto Dto(string? transcriptPath, string vendor = "claude") =>
         Agent("a1", vendor, hasTerminal: true, repoPath: "/repo/x") with { TranscriptPath = transcriptPath };
 
     static ToolGroupItem Group(ChatTabViewModel chat, int index) => (ToolGroupItem)chat.Items[index];
+    static PendingCardItem[] CardRows(ChatTabViewModel chat) => [.. chat.Items.OfType<PendingCardItem>()];
 
     sealed class Harness {
         public FakeDaemonClientService Daemon { get; } = new();
@@ -81,6 +82,8 @@ await RunOnUiAsync(async () => {
             var h = Claude(seed: p => p.Add(PermissionEntries.Entry("r1", "a1")));
             await WaitUntilAsync(() => h.Chat.PendingCards.Count == 1, what: "the replayed card");
             await Assert.That(h.Chat.HasPendingCards).IsTrue();
+            await Assert.That(CardRows(h.Chat).Select(c => c.Card.RequestId)).IsEquivalentTo(new[] { "r1" });
+            await Assert.That(h.Chat.PhaseNote).IsEqualTo("");
             await h.TeardownAsync();
         });
     }
@@ -405,10 +408,70 @@ await RunOnUiAsync(async () => {
             await WaitUntilAsync(() => h.Chat.PendingCards.Count == 2, what: "two cards");
             await Assert.That(h.Chat.PendingCards.Select(c => c.RequestId).ToArray()).IsEquivalentTo(new[] { "r1", "r2" }, CollectionOrdering.Matching);
             await Assert.That(h.Chat.HasPendingCards).IsTrue();
+            await Assert.That(CardRows(h.Chat).Select(c => c.Card.RequestId)).IsEquivalentTo(new[] { "r1", "r2" }, CollectionOrdering.Matching);
 
             h.Permissions.Remove("r1");
             await WaitUntilAsync(() => h.Chat.PendingCards.Count == 1, what: "one card left");
             await Assert.That(h.Chat.PendingCards[0].RequestId).IsEqualTo("r2");
+            await Assert.That(CardRows(h.Chat).Select(c => c.Card.RequestId)).IsEquivalentTo(new[] { "r2" });
+            await h.TeardownAsync();
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task Pending_cards_sit_at_the_end_of_the_item_list_and_return_after_a_path_switch() {
+        await RunOnUiAsync(async () => {
+            var h = Claude();
+            var path = Tmp.CreateFile("t.jsonl", [UserLine, AssistantLine]);
+            await h.PushAsync(Dto(path));
+            h.Permissions.Add(PermissionEntries.Entry("r1", "a1"));
+            await WaitUntilAsync(() => CardRows(h.Chat).Length == 1, what: "card in the list");
+            await Assert.That(h.Chat.Items.Select(i => i.GetType().Name)).IsEquivalentTo(
+                new[] { nameof(UserTurnItem), nameof(AssistantTextItem), nameof(PendingCardItem) }, CollectionOrdering.Matching);
+            await Assert.That(CardRows(h.Chat)[0].Card.RequestId).IsEqualTo("r1");
+
+            var other = Tmp.CreateFile("u.jsonl", [UserLine]);
+            await h.PushAsync(Dto(other));
+            await Assert.That(h.Chat.Items.OfType<PendingCardItem>().Select(c => c.Card.RequestId)).IsEquivalentTo(new[] { "r1" });
+            await Assert.That(h.Chat.Items[^1]).IsTypeOf<PendingCardItem>();
+            await h.TeardownAsync();
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_card_packs_against_the_tool_group_it_follows_and_unpacks_when_cleared() {
+        await RunOnUiAsync(async () => {
+            var h = Claude();
+            var path = Tmp.CreateFile("ask.jsonl", [
+                """{"type":"assistant","message":{"content":[{"type":"tool_use","id":"t1","name":"AskUserQuestion","input":{"questions":[{"question":"declare this"}]}}]}}""",
+            ]);
+            await h.PushAsync(Dto(path));
+            h.Permissions.Add(PermissionEntries.Question("q1"));
+            await WaitUntilAsync(() => CardRows(h.Chat).Length == 1, what: "the card");
+            var group = (ToolGroupItem)h.Chat.Items[0];
+            await Assert.That(group.PacksWithCard).IsTrue();
+            await Assert.That(CardRows(h.Chat)[0].PacksWithPrevious).IsTrue();
+
+            h.Permissions.Remove("q1");
+            await WaitUntilAsync(() => CardRows(h.Chat).Length == 0, what: "cleared");
+            await Assert.That(group.PacksWithCard).IsFalse();
+            await h.TeardownAsync();
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_card_after_prose_does_not_pack() {
+        await RunOnUiAsync(async () => {
+            var h = Claude();
+            var path = Tmp.CreateFile("t.jsonl", [UserLine, AssistantLine]);
+            await h.PushAsync(Dto(path));
+            h.Permissions.Add(PermissionEntries.Question("q1"));
+            await WaitUntilAsync(() => CardRows(h.Chat).Length == 1, what: "the card");
+            await Assert.That(h.Chat.Items.OfType<ToolGroupItem>().Any(g => g.PacksWithCard)).IsFalse();
+            await Assert.That(CardRows(h.Chat)[0].PacksWithPrevious).IsFalse();
             await h.TeardownAsync();
         });
     }
@@ -438,6 +501,8 @@ await RunOnUiAsync(async () => {
             await WaitUntilAsync(() => h.Chat.PendingCards.Count == 2, what: "both cards");
             await Assert.That(h.Chat.PendingCards[0]).IsTypeOf<PermissionCardViewModel>();
             await Assert.That(h.Chat.PendingCards[1]).IsTypeOf<QuestionCardViewModel>();
+            await Assert.That(CardRows(h.Chat).Select(c => c.Card.GetType().Name)).IsEquivalentTo(
+                new[] { nameof(PermissionCardViewModel), nameof(QuestionCardViewModel) }, CollectionOrdering.Matching);
 
             h.Permissions.Remove("q1");
             await WaitUntilAsync(() => h.Chat.PendingCards.Count == 1, what: "question card removed");
diff --git a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
index 0b1e6ab18..84fd8b41c 100644
--- a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
@@ -48,7 +48,7 @@ static List<Control> ToolRows(ChatTabView view) => view.GetVisualDescendants().O
         .Where(c => c.Name == "ToolCallRow" && c.DataContext is ToolCallItem).ToList();
     static Button Summary(ChatTabView view) => view.GetVisualDescendants().OfType<Button>().Single(b => b.Classes.Contains("toolSummary"));
     static Button? SummaryOrNull(ChatTabView view) => view.GetVisualDescendants().OfType<Button>().FirstOrDefault(b => b.Classes.Contains("toolSummary"));
-    static ToolGroupItem OnlyGroup(Host host) => (ToolGroupItem)host.Chat.Items.Single();
+    static ToolGroupItem OnlyGroup(Host host) => host.Chat.Items.OfType<ToolGroupItem>().Single();
 
     /// A synthetic pointer event hit-tests the compositor's last committed scene, which layout alone
     /// does not refresh: a control shown since the last frame is invisible to the click until the
@@ -950,23 +950,23 @@ await host.LoadAsync(Tmp.CreateFile("note.jsonl", [
 
     [Test]
     [NotInParallel("AvaloniaSession")]
-    public async Task Card_renders_with_its_buttons_and_the_row_collapses_when_empty() {
+    public async Task Card_renders_with_its_buttons_and_leaves_the_list_when_empty() {
         await RunOnUiAsync(async () => {
             var host = new Host();
-            var row = host.View.FindControl<Border>("NeedsYouRow")!;
-            await Assert.That(row.IsVisible).IsFalse();
+            await Assert.That(host.View.FindControl<Border>("NeedsYouRow")).IsNull();
+            await Assert.That(host.Chat.Items.OfType<PendingCardItem>().Any()).IsFalse();
 
             host.Permissions.Add(PermissionEntries.Entry("r1", "a1", toolName: "Bash"));
-            await WaitUntilAsync(() => host.Chat.PendingCards.Count == 1, what: "the card");
+            await WaitUntilAsync(() => host.Chat.Items.OfType<PendingCardItem>().Any(), what: "the card");
             Dispatcher.UIThread.RunJobs();
-            await Assert.That(row.IsVisible).IsTrue();
-            var buttons = row.GetVisualDescendants().OfType<Button>().Select(b => b.Content?.ToString() ?? "").ToArray();
+            var list = host.View.FindControl<ItemsControl>("ChatItems")!;
+            var buttons = list.GetVisualDescendants().OfType<Button>().Select(b => b.Content?.ToString() ?? "").ToArray();
             await Assert.That(buttons).IsEquivalentTo(new[] { "Deny", "Allow always", "Allow" });
 
             host.Permissions.Remove("r1");
-            await WaitUntilAsync(() => host.Chat.PendingCards.Count == 0, what: "cleared");
+            await WaitUntilAsync(() => !host.Chat.Items.OfType<PendingCardItem>().Any(), what: "cleared");
             Dispatcher.UIThread.RunJobs();
-            await Assert.That(row.IsVisible).IsFalse();
+            await Assert.That(list.GetVisualDescendants().OfType<Button>().Any(b => b.Content is "Allow")).IsFalse();
         });
     }
 
@@ -989,9 +989,117 @@ await RunOnUiAsync(async () => {
             var otherBoxes = host.View.GetVisualDescendants().OfType<TextBox>()
                 .Where(t => t.PlaceholderText == "Other…").ToList();
             await Assert.That(otherBoxes.Count).IsEqualTo(1);
+            await Assert.That(otherBoxes[0].Classes.Contains("kcapField")).IsTrue();
             await Assert.That(host.View.GetVisualDescendants().OfType<TextBlock>().Any(t => t.Text == "Pick")).IsTrue();
         });
     }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_question_header_paints_like_the_tool_kind_chip() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            await host.LoadAsync(Tmp.CreateFile("ask.jsonl", [
+                """{"type":"assistant","message":{"content":[{"type":"tool_use","id":"t1","name":"AskUserQuestion","input":{"questions":[{"question":"declare this"}]}}]}}""",
+            ]));
+            host.Permissions.Add(PermissionEntries.Question("q1",
+                toolInputJson: """{"questions":[{"question":"declare this","header":"Missing tools","options":[{"label":"A"}]}]}"""));
+            await WaitUntilAsync(() => host.Chat.Items.OfType<PendingCardItem>().Any(), what: "the card");
+            host.Settle();
+
+            var chips = host.View.GetVisualDescendants().OfType<TextBlock>()
+                .Where(t => t.Classes.Contains("toolKindChip") && t.IsEffectivelyVisible).ToList();
+            var kind = chips.Single(t => t.Text == "Question");
+            var header = chips.Single(t => t.Text == "Missing tools");
+            await Assert.That(header.FontSize).IsEqualTo(kind.FontSize);
+            await Assert.That(header.FontWeight).IsEqualTo(kind.FontWeight);
+            await Assert.That(header.Foreground).IsSameReferenceAs(kind.Foreground);
+
+            var question = host.View.GetVisualDescendants().OfType<TextBlock>()
+                .Single(t => t.Classes.Contains("prompt") && t.Text == "declare this");
+            await Assert.That(header.FontSize).IsNotEqualTo(question.FontSize);
+            await host.CloseAsync();
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_question_card_packs_against_the_tool_group_it_follows() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            await host.LoadAsync(Tmp.CreateFile("ask.jsonl", [
+                """{"type":"assistant","message":{"content":[{"type":"tool_use","id":"t1","name":"AskUserQuestion","input":{"questions":[{"question":"declare this"}]}}]}}""",
+            ]));
+            host.Permissions.Add(PermissionEntries.Question("q1",
+                toolInputJson: """{"questions":[{"question":"declare this","header":"Missing tools","options":[{"label":"A"}]}]}"""));
+            await WaitUntilAsync(() => host.Chat.Items.OfType<PendingCardItem>().Any(), what: "the card");
+            host.Settle();
+
+            var group = host.View.GetVisualDescendants().OfType<Border>().Single(b => b.Classes.Contains("toolGroup"));
+            var card = host.View.GetVisualDescendants().OfType<ContentControl>().Single(c => c.Classes.Contains("pendingCard"));
+            await Assert.That(group.Classes.Contains("packsWithCard")).IsTrue();
+            await Assert.That(card.Classes.Contains("packsWithPrevious")).IsTrue();
+            await Assert.That(group.Margin.Bottom).IsEqualTo(4);
+            await Assert.That(card.Margin.Top).IsEqualTo(4);
+            await host.CloseAsync();
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_question_card_after_prose_keeps_the_paragraph_gap() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            await host.LoadAsync(Tmp.CreateFile("prose.jsonl", [UserLine]));
+            host.Permissions.Add(PermissionEntries.Question("q1"));
+            await WaitUntilAsync(() => host.Chat.Items.OfType<PendingCardItem>().Any(), what: "the card");
+            host.Settle();
+
+            var card = host.View.GetVisualDescendants().OfType<ContentControl>().Single(c => c.Classes.Contains("pendingCard"));
+            await Assert.That(card.Classes.Contains("packsWithPrevious")).IsFalse();
+            await Assert.That(card.Margin.Top).IsEqualTo(8);
+            await host.CloseAsync();
+        });
+    }
+
+    /// The Other field is a real input in the virtualizing list: a click must keep caret focus
+    /// through layout (follow-tail must not recycle the row), and its outline is the field token,
+    /// never the status green.
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task Other_keeps_focus_on_click_and_uses_the_field_border_not_status_green() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            await host.LoadAsync(Tmp.CreateFile("tall.jsonl", Enumerable.Repeat(UserLine, 40).ToArray()));
+            host.Permissions.Add(PermissionEntries.Question("q1"));
+            await WaitUntilAsync(() => host.Chat.Items.OfType<PendingCardItem>().Any(), what: "the card");
+            host.Settle();
+
+            var other = host.View.GetVisualDescendants().OfType<TextBox>().Single(t => t.PlaceholderText == "Other…");
+            Click(host, other);
+            host.Settle();
+            await Assert.That(other.IsFocused).IsTrue();
+
+            host.Window.KeyTextInput("mine");
+            Dispatcher.UIThread.RunJobs();
+            host.Settle();
+            await Assert.That(other.IsFocused).IsTrue();
+            await Assert.That(other.Text).IsEqualTo("mine");
+            await Assert.That(((QuestionGroupViewModel)other.DataContext!).OtherText).IsEqualTo("mine");
+
+            var ring = other.GetVisualDescendants().OfType<Border>().Single(b => b.Name == "PART_BorderElement");
+            var field = (IBrush)Application.Current!.FindResource("KcapBorderBrush")!;
+            var status = (IBrush)Application.Current!.FindResource("KcapSuccessBrush")!;
+            await Assert.That(ring.BorderBrush).IsSameReferenceAs(field);
+            await Assert.That(ring.BorderBrush).IsNotSameReferenceAs(status);
+            await Assert.That(ring.BorderThickness).IsEqualTo(new Thickness(1));
+
+            var card = host.View.GetVisualDescendants().OfType<Border>().Single(b => b.Name == "QuestionCard");
+            await Assert.That(card.BorderBrush).IsSameReferenceAs(field);
+            await Assert.That(card.BorderBrush).IsNotSameReferenceAs(status);
+            await host.CloseAsync();
+        });
+    }
     static Button Option(Host host, string label) => host.View.GetVisualDescendants().OfType<Button>()
         .Single(b => b.Classes.Contains("option") && b.DataContext is QuestionOptionViewModel { Label: var l } && l == label);
     static List<Button> Steps(Host host) => host.View.GetVisualDescendants().OfType<Button>().Where(b => b.Classes.Contains("step")).ToList();
diff --git a/test/Capacitor.App.Tests.Unit/PermissionServiceTests.cs b/test/Capacitor.App.Tests.Unit/PermissionServiceTests.cs
index c148ed210..2f854a5da 100644
--- a/test/Capacitor.App.Tests.Unit/PermissionServiceTests.cs
+++ b/test/Capacitor.App.Tests.Unit/PermissionServiceTests.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Subjects;
 using System.Runtime.CompilerServices;
+using System.Text.Json;
 using System.Threading.Channels;
 using Capacitor.App.Services;
 using Capacitor.Cli.Core;
@@ -16,9 +17,24 @@ public class PermissionServiceTests {
     static PermissionPendingDto Dto(string id = "r1", string agent = "a1", string? serverRequestId = null) =>
         new(id, agent, "s1", "claude", "Bash", null, null, false, false, "2026-08-28T10:00:00.0000000+00:00", null, serverRequestId);
 
+    static PermissionPendingDto QuestionDto(string id = "q1", string? serverRequestId = null, string question = "Pick a lane",
+            string session = "s1", string? header = null) {
+        var body = header is null
+            ? $$"""{"questions":[{"question":{{JsonSerializer.Serialize(question)}},"options":[{"label":"A"}]}]}"""
+            : $$"""{"questions":[{"question":{{JsonSerializer.Serialize(question)}},"header":{{JsonSerializer.Serialize(header)}},"options":[{"label":"A"}]}]}""";
+        using var doc = JsonDocument.Parse(body);
+        return new(id, "a1", session, "claude", ClaudeElicitation.ToolName, doc.RootElement.Clone(), null, false, false,
+            "2026-08-28T10:00:00.0000000+00:00", null, serverRequestId);
+    }
+
     static PendingPermissionRequest ServerPermission(string id = "srv-1", string session = "s1", IReadOnlyList<AcpInteractionOption>? options = null) =>
         PendingPermissionRequest.FromServer(new ServerPermissionRequest(session, id, "Bash", null, options), "claude", DateTimeOffset.UtcNow);
 
+    static PendingPermissionRequest ServerQuestion(string id = "srv-q", string prompt = "Pick a lane", string session = "s1") =>
+        PendingPermissionRequest.FromServer(
+            new ServerElicitationRequest(session, id, prompt, [new() { OptionId = "a", Label = "A" }], false),
+            DateTimeOffset.UtcNow);
+
     sealed class FakePermissionStream {
         readonly Channel<PermissionStreamEvent?> _channel = Channel.CreateUnbounded<PermissionStreamEvent?>();
         int _attempts;
@@ -362,6 +378,81 @@ public async Task A_correlated_local_item_keeps_its_instance_and_shadows_the_ser
         await Assert.That(h.View.Count).IsEqualTo(1);
     }
 
+    [Test]
+    public async Task A_local_question_shadows_a_server_elicitation_with_the_same_prompt() {
+        using var h = new Harness();
+        await h.StartAsync();
+        var local = await h.EmitAsync(QuestionDto());
+        h.Service.UpsertServer(ServerQuestion());
+        await Assert.That(h.View.Count).IsEqualTo(1);
+        await Assert.That(ReferenceEquals(h.View.Lookup("local:q1").Value, local)).IsTrue();
+        await Assert.That(local.ServerRequestId).IsEqualTo("srv-q");
+        await Assert.That(h.View.Lookup("server:srv-q").HasValue).IsFalse();
+    }
+
+    [Test]
+    public async Task A_server_elicitation_is_shadowed_by_a_later_local_question_with_the_same_prompt() {
+        using var h = new Harness();
+        await h.StartAsync();
+        h.Service.UpsertServer(ServerQuestion());
+        await Assert.That(h.View.Count).IsEqualTo(1);
+
+        var local = await h.EmitAsync(QuestionDto());
+        await WaitUntilAsync(() => h.View.Count == 1, what: "twin shadowed");
+        await Assert.That(ReferenceEquals(h.View.Lookup("local:q1").Value, local)).IsTrue();
+        await Assert.That(local.ServerRequestId).IsEqualTo("srv-q");
+    }
+
+    [Test]
+    public async Task A_bash_permission_and_a_server_elicitation_stay_two_cards() {
+        using var h = new Harness();
+        await h.StartAsync();
+        await h.EmitAsync(Dto("l1"));
+        h.Service.UpsertServer(ServerQuestion());
+        await Assert.That(h.View.Count).IsEqualTo(2);
+    }
+
+    [Test]
+    public async Task Different_question_texts_stay_two_cards() {
+        using var h = new Harness();
+        await h.StartAsync();
+        await h.EmitAsync(QuestionDto(question: "Pick a lane"));
+        h.Service.UpsertServer(ServerQuestion(prompt: "Pick a different lane"));
+        await Assert.That(h.View.Count).IsEqualTo(2);
+    }
+
+    [Test]
+    public async Task Same_prompt_on_different_sessions_stay_two_cards() {
+        using var h = new Harness();
+        await h.StartAsync();
+        await h.EmitAsync(QuestionDto(session: "s1"));
+        h.Service.UpsertServer(ServerQuestion(session: "s2"));
+        await Assert.That(h.View.Count).IsEqualTo(2);
+    }
+
+    [Test]
+    public async Task Header_plus_question_matches_an_acp_prompt_that_includes_the_header() {
+        using var h = new Harness();
+        await h.StartAsync();
+        var local = await h.EmitAsync(QuestionDto(question: "declare this", header: "Missing tools"));
+        h.Service.UpsertServer(ServerQuestion(prompt: "Missing tools\n\ndeclare this"));
+        await Assert.That(h.View.Count).IsEqualTo(1);
+        await Assert.That(local.ServerRequestId).IsEqualTo("srv-q");
+    }
+
+    [Test]
+    public async Task A_disconnect_resurfaces_the_prompt_shadowed_elicitation() {
+        using var h = new Harness();
+        await h.StartAsync();
+        await h.EmitAsync(QuestionDto());
+        h.Service.UpsertServer(ServerQuestion());
+        await Assert.That(h.View.Count).IsEqualTo(1);
+
+        h.Daemon.StatusSubject.OnNext(new AttachStatus(AttachState.Unreachable, "daemon_unreachable", null));
+        await WaitUntilAsync(() => h.View.Lookup("server:srv-q").HasValue, what: "twin resurfaced");
+        await Assert.That(h.View.Lookup("local:q1").HasValue).IsFalse();
+    }
+
     [Test]
     public async Task Subscription_loss_resurfaces_the_shadowed_twin_with_its_own_handle() {
         using var h = new Harness();

From a2025601eaec3cd59e4a5bec63152570a9400b30 Mon Sep 17 00:00:00 2001
From: Norton Andreev <norton@nortonandreev.com>
Date: Mon, 14 Sep 2026 20:29:19 +0600
Subject: [PATCH 2/2] Clear packing on every tool group before rebuilding
 trailing cards

---
 .../ViewModels/ChatTabViewModel.cs            |  5 ++--
 .../ChatTabViewModelTests.cs                  | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
index 73844665f..bd6dd09de 100644
--- a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
+++ b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
@@ -714,8 +714,9 @@ void SyncPendingCardItems() {
         while (start > 0 && _items[start - 1] is PendingCardItem) start--;
         if (TrailingCardsMatch(start, cards)) return;
 
-        if (start > 0 && _items[start - 1] is ToolGroupItem previous)
-            previous.PacksWithCard = false;
+        foreach (var item in _items)
+            if (item is ToolGroupItem { PacksWithCard: true } packed)
+                packed.PacksWithCard = false;
 
         var wasEmpty = _items.Count == 0;
         for (var i = _items.Count - 1; i >= 0; i--)
diff --git a/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs b/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
index 9355627b2..f2c2d7fca 100644
--- a/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatTabViewModelTests.cs
@@ -461,6 +461,30 @@ await RunOnUiAsync(async () => {
         });
     }
 
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_later_transcript_row_unpacks_the_group_the_card_left() {
+        await RunOnUiAsync(async () => {
+            var h = Claude();
+            var path = Tmp.CreateFile("ask.jsonl", [
+                """{"type":"assistant","message":{"content":[{"type":"tool_use","id":"t1","name":"AskUserQuestion","input":{"questions":[{"question":"declare this"}]}}]}}""",
+            ]);
+            await h.PushAsync(Dto(path));
+            h.Permissions.Add(PermissionEntries.Question("q1"));
+            await WaitUntilAsync(() => CardRows(h.Chat).Length == 1, what: "the card");
+            var group = (ToolGroupItem)h.Chat.Items[0];
+            await Assert.That(group.PacksWithCard).IsTrue();
+
+            File.AppendAllText(path, AssistantLine + "\n");
+            await h.TickAsync();
+            await Assert.That(h.Chat.Items.Select(i => i.GetType().Name)).IsEquivalentTo(
+                new[] { nameof(ToolGroupItem), nameof(AssistantTextItem), nameof(PendingCardItem) }, CollectionOrdering.Matching);
+            await Assert.That(group.PacksWithCard).IsFalse();
+            await Assert.That(CardRows(h.Chat)[0].PacksWithPrevious).IsFalse();
+            await h.TeardownAsync();
+        });
+    }
+
     [Test]
     [NotInParallel("AvaloniaSession")]
     public async Task A_card_after_prose_does_not_pack() {