From 9756871d8093cbc99685a8ddb1bade1151e0a77e Mon Sep 17 00:00:00 2001
From: Norton Andreev <norton@nortonandreev.com>
Date: Thu, 22 Oct 2026 20:36:07 +0300
Subject: [PATCH 1/2] Restrict desktop Escape interruption to confirmed
 foreground work

---
 .../ViewModels/ChatTabViewModel.cs            | 11 +++
 src/Capacitor.App/Views/ChatTabView.axaml     |  2 +-
 src/Capacitor.App/Views/ChatTabView.axaml.cs  |  8 +-
 .../ChatTabViewSmokeTests.cs                  | 95 +++++++++++++++++++
 .../RemoteSessionViewSmokeTests.cs            | 17 ++--
 5 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
index 4215e7777..4798d526b 100644
--- a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
+++ b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
@@ -434,6 +434,12 @@ public IReadOnlyList<TerminalMenuChoiceViewModel> TerminalMenuChoices {
     readonly ObservableAsPropertyHelper<bool> _showsInterrupt;
     public bool ShowsInterrupt => _showsInterrupt.Value;
 
+    // Running alone, or background work while the parent waits, does not make Escape safe at its prompt.
+    public bool CanInterruptWithEscape => ShowsInterrupt && _awaitingInput == false;
+
+    readonly ObservableAsPropertyHelper<string> _interruptLabel;
+    public string InterruptLabel => _interruptLabel.Value;
+
     string _vendor = "";
     IReadOnlyList<HarnessOption> _options = HostedHarnessCatalog.Build(null);
 
@@ -748,6 +754,11 @@ public ChatTabViewModel(
                     && (AgentStatus.Kind == AgentStatusKind.Working || AgentStatus.IsRunningUnknownTurn))
             .DisposeWith(_disposables);
 
+        _interruptLabel = this.WhenAnyValue(x => x.ShowsInterrupt, x => x.AgentStatus,
+                (_, _) => CanInterruptWithEscape ? "Interrupt (Esc)" : "Interrupt")
+            .ToProperty(this, x => x.InterruptLabel, initialValue: "Interrupt")
+            .DisposeWith(_disposables);
+
         // The banner carries the read-only explanation for a flow participant, so the hint
         // goes blank there instead of offering a reply that can never be sent.
         _composerHint = Observable.CombineLatest(
diff --git a/src/Capacitor.App/Views/ChatTabView.axaml b/src/Capacitor.App/Views/ChatTabView.axaml
index 4d9901e25..fc0b2a110 100644
--- a/src/Capacitor.App/Views/ChatTabView.axaml
+++ b/src/Capacitor.App/Views/ChatTabView.axaml
@@ -473,7 +473,7 @@
                             </Button>
                             <TextBlock Grid.Column="1" Text="{Binding ComposerHint}" FontSize="12.5" Foreground="{StaticResource KcapFaintBrush}"
                                        VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
-                            <Button x:Name="InterruptButton" Grid.Column="2" Classes="kcapChip" Content="Interrupt (Esc)"
+                            <Button x:Name="InterruptButton" Grid.Column="2" Classes="kcapChip" Content="{Binding InterruptLabel}"
                                     Command="{Binding InterruptCommand}" IsVisible="{Binding ShowsInterrupt}"
                                     ToolTip.Tip="Interrupt the current turn without ending the session" Margin="12,0,0,0"
                                     BorderThickness="1" Height="24" Padding="10,0" VerticalContentAlignment="Center"
diff --git a/src/Capacitor.App/Views/ChatTabView.axaml.cs b/src/Capacitor.App/Views/ChatTabView.axaml.cs
index f8981b7e1..81f7e7117 100644
--- a/src/Capacitor.App/Views/ChatTabView.axaml.cs
+++ b/src/Capacitor.App/Views/ChatTabView.axaml.cs
@@ -608,11 +608,6 @@ bool ListTextBoxOwnsFocus() {
     /// TextBox's own newline. ↑/↓ recall sent prompts only from the first/last line, so inside a
     /// multi-line recall they stay the TextBox's own caret moves until the caret reaches an edge.
     void OnComposerKeyDown(object? sender, KeyEventArgs e) {
-        if (e.Key == Key.Escape && e.KeyModifiers == KeyModifiers.None) {
-            e.Handled = true;
-            TryInterrupt();
-            return;
-        }
         if (e.Key is Key.Up or Key.Down && e.KeyModifiers == KeyModifiers.None) {
             if (DataContext is not ChatTabViewModel tab || ComposerInput.SelectionStart != ComposerInput.SelectionEnd) return;
             var (line, lines) = ComposerCaretLine();
@@ -635,7 +630,8 @@ protected override void OnKeyDown(KeyEventArgs e) {
     }
 
     bool TryInterrupt() {
-        if (DataContext is not ChatTabViewModel chat || !((ICommand)chat.InterruptCommand).CanExecute(null)) return false;
+        if (DataContext is not ChatTabViewModel chat || !chat.CanInterruptWithEscape
+            || !((ICommand)chat.InterruptCommand).CanExecute(null)) return false;
         chat.InterruptCommand.Execute().Subscribe();
         return true;
     }
diff --git a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
index 99b08fb59..b178cab57 100644
--- a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
@@ -967,6 +967,101 @@ await RunOnUiAsync(async () => {
         });
     }
 
+    [Test]
+    [Arguments(null, 0)]
+    [Arguments(true, 0)]
+    [Arguments(true, 1)]
+    [NotInParallel("AvaloniaSession")]
+    public async Task Escape_does_not_reach_a_prompt_without_a_confirmed_foreground_turn(bool? awaitingInput, int liveSubagents) {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            try {
+                var path = Tmp.CreateFile("escape-idle.jsonl", [UserLine]);
+                var client = await host.AttachAsync(path);
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = awaitingInput, LiveSubagents = liveSubagents,
+                });
+                host.Type("keep this draft");
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(client.SentInput).IsEmpty();
+                await Assert.That(host.Composer.Text).IsEqualTo("keep this draft");
+                // A known working turn may be interrupted; the same shortcut goes inert as soon as it ends.
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                });
+                host.Settle();
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(client.SentInput).Count().IsEqualTo(1);
+                await Assert.That(client.SentInput[0]).IsEquivalentTo(new byte[] { 0x1b });
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = true,
+                });
+                host.Settle();
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(client.SentInput).Count().IsEqualTo(1);
+                await Assert.That(host.Terminal.State.Phase).IsEqualTo(TerminalSessionPhase.Attached);
+                await Assert.That(host.Composer.Text).IsEqualTo("keep this draft");
+            } finally { await host.CloseAsync(); }
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task A_child_control_can_consume_Escape_before_the_chat_interrupts() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            try {
+                var path = Tmp.CreateFile("escape-child.jsonl", [UserLine]);
+                var client = await host.AttachAsync(path);
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                });
+                host.Type("keep this draft");
+                var consumed = false;
+                host.Composer.KeyDown += (_, e) => {
+                    if (e.Key != Key.Escape) return;
+                    consumed = true;
+                    e.Handled = true;
+                };
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(consumed).IsTrue();
+                await Assert.That(client.SentInput).IsEmpty();
+                await Assert.That(host.Composer.Text).IsEqualTo("keep this draft");
+            } finally { await host.CloseAsync(); }
+        });
+    }
+
+    [Test]
+    [NotInParallel("AvaloniaSession")]
+    public async Task Escape_dismisses_the_composer_context_menu_before_interrupting_the_turn() {
+        await RunOnUiAsync(async () => {
+            var host = new Host();
+            try {
+                var path = Tmp.CreateFile("escape-menu.jsonl", [UserLine]);
+                var client = await host.AttachAsync(path);
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                });
+                host.Type("keep this draft");
+                var item = new MenuItem { Header = "Copy" };
+                var menu = new ContextMenu { ItemsSource = new[] { item } };
+                host.Composer.ContextMenu = menu;
+                menu.Open(host.Composer);
+                host.Settle();
+                item.Focus();
+                await Assert.That(menu.IsOpen).IsTrue();
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(menu.IsOpen).IsFalse();
+                await Assert.That(client.SentInput).IsEmpty();
+                host.Composer.Focus();
+                host.Press(PhysicalKey.Escape);
+                await Assert.That(client.SentInput).Count().IsEqualTo(1);
+                await Assert.That(client.SentInput[0]).IsEquivalentTo(new byte[] { 0x1b });
+                await Assert.That(host.Composer.Text).IsEqualTo("keep this draft");
+            } finally { await host.CloseAsync(); }
+        });
+    }
+
     [Test]
     [NotInParallel("AvaloniaSession")]
     public async Task The_queue_banner_shows_sent_text_until_the_transcript_echoes_it() {
diff --git a/test/Capacitor.App.Tests.Unit/RemoteSessionViewSmokeTests.cs b/test/Capacitor.App.Tests.Unit/RemoteSessionViewSmokeTests.cs
index c83fc2e85..9ef05ac72 100644
--- a/test/Capacitor.App.Tests.Unit/RemoteSessionViewSmokeTests.cs
+++ b/test/Capacitor.App.Tests.Unit/RemoteSessionViewSmokeTests.cs
@@ -332,9 +332,7 @@ await Assert.That(host.View.FindControl<TextBlock>("AccessNoteText")!.Text)
     }
 
     [Test]
-    [Arguments(false)]
-    [Arguments(true)]
-    public async Task A_remote_running_turn_without_turn_details_can_be_interrupted_until_idle_or_disconnected(bool button) {
+    public async Task A_remote_running_turn_without_turn_details_can_be_interrupted_explicitly_until_idle_or_disconnected() {
         await AvaloniaSession.DispatchAsync(async () => {
             using var host = new Host();
             try {
@@ -349,11 +347,14 @@ await AvaloniaSession.DispatchAsync(async () => {
                 composer.Focus();
                 host.Window.KeyTextInput("keep this draft");
                 host.Settle();
-                if (button) {
-                    var point = interrupt.TranslatePoint(new Point(interrupt.Bounds.Width / 2, interrupt.Bounds.Height / 2), host.Window)!.Value;
-                    host.Window.MouseDown(point, MouseButton.Left);
-                    host.Window.MouseUp(point, MouseButton.Left);
-                } else host.Window.KeyPressQwerty(PhysicalKey.Escape, RawInputModifiers.None);
+                // Unknown turn state keeps the explicit action, but a casual Escape must not reach the PTY.
+                host.Window.KeyPressQwerty(PhysicalKey.Escape, RawInputModifiers.None);
+                host.Settle();
+                await Assert.That(host.Lane.SpecialKeys).IsEmpty();
+                await Assert.That(interrupt.Content).IsEqualTo("Interrupt");
+                var point = interrupt.TranslatePoint(new Point(interrupt.Bounds.Width / 2, interrupt.Bounds.Height / 2), host.Window)!.Value;
+                host.Window.MouseDown(point, MouseButton.Left);
+                host.Window.MouseUp(point, MouseButton.Left);
                 await host.SettleUntilAsync(() => host.Lane.SpecialKeys.Count == 1, "interrupt delivered");
                 await Assert.That(host.Lane.SpecialKeys).IsEquivalentTo(new[] { ("a1", SpecialKeys.Escape) });
                 await Assert.That(composer.Text).IsEqualTo("keep this draft");

From ac0d7a7decb87825ac2da3c0d6080f5fb07efc41 Mon Sep 17 00:00:00 2001
From: Norton Andreev <norton@nortonandreev.com>
Date: Fri, 23 Oct 2026 14:51:43 +0300
Subject: [PATCH 2/2] Attest a running turn before Escape interrupts it

An idle PTY prompt also reports AwaitingInput false, so the daemon now sends
TurnAttested: true only after an ACP turn gate or a relayed submit or tool-call
hook, until the next turn end or quiet mark.
---
 .../ViewModels/AgentStatusPresentation.cs     |  4 ++
 .../ViewModels/ChatSessionInfo.cs             |  6 ++-
 .../ViewModels/ChatTabViewModel.cs            | 20 ++++++--
 .../ViewModels/SessionStatusDots.cs           |  7 ++-
 src/Capacitor.App/Views/ChatTabView.axaml.cs  |  5 +-
 src/Capacitor.Cli.Core/LocalIpc/StatusIpc.cs  |  7 ++-
 .../Services/AgentActivityClock.cs            | 35 +++++++++++--
 .../Services/AgentOrchestrator.LocalIpc.cs    |  3 +-
 .../Services/AgentOrchestrator.cs             |  1 +
 .../ChatComposerTests.cs                      |  2 +-
 .../ChatTabViewSmokeTests.cs                  | 42 ++++++++++++----
 .../SessionStatusDotsTests.cs                 | 15 ++++++
 .../LocalIpc/StatusIpcJsonTests.cs            | 43 ++++++++++------
 .../Services/AgentActivityClockTests.cs       | 50 +++++++++++++++++++
 .../Services/AgentStatusSnapshotTests.cs      | 22 ++++++++
 15 files changed, 218 insertions(+), 44 deletions(-)

diff --git a/src/Capacitor.App/ViewModels/AgentStatusPresentation.cs b/src/Capacitor.App/ViewModels/AgentStatusPresentation.cs
index 1d88a1dce..bec5c6fcb 100644
--- a/src/Capacitor.App/ViewModels/AgentStatusPresentation.cs
+++ b/src/Capacitor.App/ViewModels/AgentStatusPresentation.cs
@@ -13,6 +13,10 @@ public sealed record AgentStatusPresentation(
     public string AccessibleName => Tip.Length == 0 ? "" : Tip.Split('\n')[0];
 
     public bool HasLabel => Label.Length > 0;
+    /// Working, and the daemon has proof a turn is running rather than an idle prompt that never
+    /// reported a turn end. Only this makes a mid-turn keystroke like Escape safe to send.
+    public bool InForegroundTurn { get; init; }
+
     /// The daemon says Running but the turn is unknown (a remote row): live, yet not claimed as Working.
     public bool IsRunningUnknownTurn => !Ended && Kind == AgentStatusKind.Other && Label == "Running";
     public bool IsInFlight => Kind is AgentStatusKind.Working or AgentStatusKind.Starting or AgentStatusKind.Resuming || IsRunningUnknownTurn;
diff --git a/src/Capacitor.App/ViewModels/ChatSessionInfo.cs b/src/Capacitor.App/ViewModels/ChatSessionInfo.cs
index 0208aac2c..4558a6d5f 100644
--- a/src/Capacitor.App/ViewModels/ChatSessionInfo.cs
+++ b/src/Capacitor.App/ViewModels/ChatSessionInfo.cs
@@ -18,7 +18,9 @@ public sealed record ChatSessionInfo(
         // Why the local daemon could not resume the agent after a restart. Null on the remote lane.
         string? Interruption = null,
         // When the local daemon saw the current turn start. Null on the remote lane and from an older daemon.
-        DateTime? WorkingSince = null) {
+        DateTime? WorkingSince = null,
+        // The local daemon's proof that a turn is running. Null on the remote lane and from an older daemon.
+        bool? TurnAttested = null) {
     /// True when this session is waiting on the user. Independent of the status word.
     public bool WaitsOnUser { get; init; }
 
@@ -37,7 +39,7 @@ public sealed record ChatSessionInfo(
         // the borrowed checkout for a reviewer.
         dto.WorktreePath ?? dto.RepoPath, dto.AwaitingInput,
         ended || SessionStatusDots.IsTerminal(dto.Status), ChatTabViewModel.ParticipantNotice(dto), dto.TranscriptPath,
-        dto.LiveSubagents, dto.UsageLimit, dto.TerminalDialog, dto.Interruption, dto.WorkingSince) {
+        dto.LiveSubagents, dto.UsageLimit, dto.TerminalDialog, dto.Interruption, dto.WorkingSince, dto.TurnAttested) {
         WaitsOnUser = SessionStatusDots.WaitsOnUser(dto), TakesAttachments = dto.Kind == "agent",
     };
 
diff --git a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
index 4798d526b..25e1ac1bc 100644
--- a/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
+++ b/src/Capacitor.App/ViewModels/ChatTabViewModel.cs
@@ -434,8 +434,8 @@ public IReadOnlyList<TerminalMenuChoiceViewModel> TerminalMenuChoices {
     readonly ObservableAsPropertyHelper<bool> _showsInterrupt;
     public bool ShowsInterrupt => _showsInterrupt.Value;
 
-    // Running alone, or background work while the parent waits, does not make Escape safe at its prompt.
-    public bool CanInterruptWithEscape => ShowsInterrupt && _awaitingInput == false;
+    readonly ObservableAsPropertyHelper<bool> _canInterruptWithEscape;
+    public bool CanInterruptWithEscape => _canInterruptWithEscape.Value;
 
     readonly ObservableAsPropertyHelper<string> _interruptLabel;
     public string InterruptLabel => _interruptLabel.Value;
@@ -501,6 +501,7 @@ private set {
     string _status = "";
     bool _ended;
     bool? _awaitingInput;
+    bool _turnAttested;
     bool _waitsOnUser;
     int? _liveSubagents;
     long? _workingSince;
@@ -566,7 +567,8 @@ void RefreshAgentStatus() {
             _status, _awaitingInput, _waitsOnUser, _liveSubagents, HasPendingCards,
             question ? _usageLimit!.Summary : null, stage, elapsed,
             answerExpected: answerExpected, ended: _ended, liveCommands: _runs.RunningCommandCount,
-            terminalDialog: _terminalDialog is not null, interruption: _interruption, agentId: _agentId);
+            terminalDialog: _terminalDialog is not null, interruption: _interruption, agentId: _agentId,
+            turnAttested: _turnAttested);
         StatusText = AgentStatus.Label;
     }
 
@@ -754,8 +756,15 @@ public ChatTabViewModel(
                     && (AgentStatus.Kind == AgentStatusKind.Working || AgentStatus.IsRunningUnknownTurn))
             .DisposeWith(_disposables);
 
-        _interruptLabel = this.WhenAnyValue(x => x.ShowsInterrupt, x => x.AgentStatus,
-                (_, _) => CanInterruptWithEscape ? "Interrupt (Esc)" : "Interrupt")
+        // The button still interrupts an unproven turn; only the shortcut, which a user presses
+        // without looking, needs the daemon's proof that a prompt is not sitting idle.
+        _canInterruptWithEscape = this.WhenAnyValue(x => x.ShowsInterrupt, x => x.AgentStatus,
+                (shows, status) => shows && status.InForegroundTurn)
+            .ToProperty(this, x => x.CanInterruptWithEscape, initialValue: false)
+            .DisposeWith(_disposables);
+
+        _interruptLabel = this.WhenAnyValue(x => x.CanInterruptWithEscape,
+                escape => escape ? "Interrupt (Esc)" : "Interrupt")
             .ToProperty(this, x => x.InterruptLabel, initialValue: "Interrupt")
             .DisposeWith(_disposables);
 
@@ -948,6 +957,7 @@ void OnSession(ChatSessionInfo info) {
         if (info.Ended)
             foreach (var queued in Tracked.Where(q => !q.IsForeign)) queued.MarkUnconfirmed();
         _awaitingInput = info.AwaitingInput;
+        _turnAttested = info.TurnAttested == true;
         _liveSubagents = info.LiveSubagents;
         _daemonWorkingSince = info.WorkingSince;
         if (!_feedReleased) _runs.SessionOver = info.Ended;
diff --git a/src/Capacitor.App/ViewModels/SessionStatusDots.cs b/src/Capacitor.App/ViewModels/SessionStatusDots.cs
index f79fa5de3..8911bdf5d 100644
--- a/src/Capacitor.App/ViewModels/SessionStatusDots.cs
+++ b/src/Capacitor.App/ViewModels/SessionStatusDots.cs
@@ -57,7 +57,8 @@ public static AgentStatusPresentation Present(
             string? usageLimitSummary, string? launchStage, string? elapsed,
             string? requester = null, string? borrowedFrom = null, bool answerExpected = false,
             string? model = null, string? harness = null, bool ended = false, int liveCommands = 0,
-            bool terminalDialog = false, string? interruption = null, string? agentId = null) {
+            bool terminalDialog = false, string? interruption = null, string? agentId = null,
+            bool turnAttested = false) {
         var kind =
             status == "Failed" ? AgentStatusKind.Failed
             : answerExpected ? AgentStatusKind.Answer
@@ -112,7 +113,9 @@ public static AgentStatusPresentation Present(
         Add(facts, requester, "Requester");
         Add(facts, borrowedFrom, "Borrowed from");
         return new AgentStatusPresentation(kind, label, FormatTip(facts),
-            kind is AgentStatusKind.Working or AgentStatusKind.Starting or AgentStatusKind.Resuming, facts) { Ended = ended };
+            kind is AgentStatusKind.Working or AgentStatusKind.Starting or AgentStatusKind.Resuming, facts) {
+            Ended = ended, InForegroundTurn = kind == AgentStatusKind.Working && turnAttested,
+        };
     }
 
     static void Add(List<AgentStatusFact> facts, string? text, string? caption = null) {
diff --git a/src/Capacitor.App/Views/ChatTabView.axaml.cs b/src/Capacitor.App/Views/ChatTabView.axaml.cs
index 81f7e7117..1379ff3b7 100644
--- a/src/Capacitor.App/Views/ChatTabView.axaml.cs
+++ b/src/Capacitor.App/Views/ChatTabView.axaml.cs
@@ -626,7 +626,10 @@ void OnComposerKeyDown(object? sender, KeyEventArgs e) {
     protected override void OnKeyDown(KeyEventArgs e) {
         base.OnKeyDown(e);
         if (e.Handled || e.Key != Key.Escape || e.KeyModifiers != KeyModifiers.None || OriginatesFromPendingCard(e)) return;
-        if (TryInterrupt()) e.Handled = true;
+        // A composer Escape stops here even with nothing to interrupt, so an ancestor's Escape
+        // binding never fires while the user is typing.
+        if (TryInterrupt() || e.Source is Visual source && (source == ComposerInput || ComposerInput.IsVisualAncestorOf(source)))
+            e.Handled = true;
     }
 
     bool TryInterrupt() {
diff --git a/src/Capacitor.Cli.Core/LocalIpc/StatusIpc.cs b/src/Capacitor.Cli.Core/LocalIpc/StatusIpc.cs
index 6e9313600..e4d601641 100644
--- a/src/Capacitor.Cli.Core/LocalIpc/StatusIpc.cs
+++ b/src/Capacitor.Cli.Core/LocalIpc/StatusIpc.cs
@@ -111,7 +111,12 @@ public sealed record AgentStatusDto(
     string? Interruption = null,
     // UTC instant the daemon last saw the agent stop waiting, while Running and not waiting. Lets a
     // freshly built view show the turn's real elapsed time. Null from an older daemon.
-    DateTime? WorkingSince = null);
+    DateTime? WorkingSince = null,
+    // The daemon has positive evidence that a turn is running: an ACP turn gate, or a PTY vendor's
+    // relayed prompt submit or tool call since its last turn end. AwaitingInput == false is not
+    // that evidence; an idle PTY prompt reports it too. False and null (an older daemon) both mean
+    // unproven, so a client must not send a keystroke that is safe only mid-turn.
+    bool? TurnAttested = null);
 
 /// Wire tokens for <see cref="AgentStatusDto.WorkLocation"/>, compared literally by every
 /// client, so they never change.
diff --git a/src/Capacitor.Cli.Daemon/Services/AgentActivityClock.cs b/src/Capacitor.Cli.Daemon/Services/AgentActivityClock.cs
index 1d14197d3..6f93c679d 100644
--- a/src/Capacitor.Cli.Daemon/Services/AgentActivityClock.cs
+++ b/src/Capacitor.Cli.Daemon/Services/AgentActivityClock.cs
@@ -33,6 +33,9 @@ internal sealed class AgentActivityClock(TimeProvider time) {
     // it. A hook verdict clears the bit and then owns the flag.
     bool    _silenceWait;
     long?   _viewerInputAt;
+    // A relayed prompt submit or tool call with no turn end since. Output and a cleared wait also
+    // describe an idle prompt, so this is a PTY vendor's only proof a turn is running.
+    bool    _hookTurn;
     ulong   _waitGeneration;
     // When the flag last became false. Silence is measured from here as well as from the last
     // output: a key that clears the wait must not be undone by the idle time already elapsed.
@@ -67,6 +70,17 @@ public bool AwaitingInput {
     /// change, with the new value.</summary>
     public Action<bool>? OnAwaitingInputChanged { get; set; }
 
+    /// <summary>Positive evidence that a turn is running now: the ACP turn gate held, or a PTY
+    /// vendor's relayed prompt submit or tool call with no turn end or quiet mark since. False
+    /// means unproven, not idle: a delivered input or a keyed submit never sets it, because a
+    /// submit that starts no turn (a local slash command) looks the same.</summary>
+    public bool TurnAttested {
+        get { lock (_gate) return _turnInFlight || _hookTurn; }
+    }
+
+    /// <summary>Fires outside <see cref="_gate"/> on every genuine <see cref="TurnAttested"/> change.</summary>
+    public Action? OnTurnAttestedChanged { get; set; }
+
     /// <summary>Counts every observed turn end, whether or not it moved the flag: a PTY vendor
     /// relays only Stop, so a wait nothing cleared sees the next turn end as a second Stop with the
     /// flag already true. A delivery samples it before writing and clears through
@@ -199,13 +213,17 @@ public void Advance() {
     /// <summary>The turn ended without a stop notice sticking: no output and no live subagent for
     /// <paramref name="quiet"/>. A later <see cref="Advance"/> clears it; a hook verdict replaces it.</summary>
     public bool TryMarkQuiet(TimeSpan quiet) {
+        bool attestedChanged;
         lock (_gate) {
             if (DueLocked(quiet) is not { } due || due > TimeSpan.Zero) return false;
+            attestedChanged = _hookTurn;
             _silenceWait   = true;
             _awaitingInput = true;
+            _hookTurn      = false;
             _waitGeneration++;
-            return true;
         }
+        if (attestedChanged) OnTurnAttestedChanged?.Invoke();
+        return true;
     }
 
     // Caller must hold _gate. Null when silence must not be applied.
@@ -244,8 +262,9 @@ bool ClearSilenceLocked() {
     /// <summary>Turn start/end — also counts as activity, independent of accompanying envelope
     /// traffic.</summary>
     public void SetTurnInFlight(bool value) {
-        bool ended, awaitingChanged;
+        bool ended, awaitingChanged, attestedChanged;
         lock (_gate) {
+            var attested = _turnInFlight || _hookTurn;
             ended = _turnInFlight && !value;
             _turnInFlight = value;
             // Only a genuine falling edge means a turn finished; a gate cleared without ever being
@@ -257,30 +276,36 @@ public void SetTurnInFlight(bool value) {
             if (!awaiting) _notAwaitingSince = time.GetTimestamp();
             if (_awaitingInput && !awaiting) _workingSince = _notAwaitingSince;
             _awaitingInput = awaiting;
+            _hookTurn = false;
+            attestedChanged = attested != value;
             AdvanceLocked();
         }
         // Outside the lock, same rule as OnLaunchStageChanged: the callback's send reads this
         // clock's own (independently guarded) properties.
         if (ended) OnTurnEnded?.Invoke();
         if (awaitingChanged) OnAwaitingInputChanged?.Invoke(!value);
+        if (attestedChanged) OnTurnAttestedChanged?.Invoke();
     }
 
-    /// <summary>The explicit path for sources that see no turn gate: a PTY vendor's hook relay
-    /// and a delivered input. Moves the flag alone — see <see cref="AwaitingInput"/>.</summary>
+    /// <summary>A PTY vendor's relayed hook verdict: Stop is true, a prompt submit or tool call
+    /// false. Moves the wait and <see cref="TurnAttested"/> alone — see <see cref="AwaitingInput"/>.</summary>
     public void SetAwaitingInput(bool value) {
-        bool changed;
+        bool changed, attestedChanged;
         lock (_gate) {
             // A hook verdict replaces a silence wait, so later output cannot clear a real stop.
             _silenceWait = false;
             changed = _awaitingInput != value;
+            attestedChanged = !_turnInFlight && _hookTurn == value;
             if (value) _waitGeneration++;
             else {
                 _notAwaitingSince = time.GetTimestamp();
                 if (changed) _workingSince = _notAwaitingSince;
             }
             _awaitingInput = value;
+            _hookTurn = !value;
         }
         if (changed) OnAwaitingInputChanged?.Invoke(value);
+        if (attestedChanged) OnTurnAttestedChanged?.Invoke();
     }
 
     /// <summary>Clears the wait a delivery answered, unless a newer one began since the caller
diff --git a/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.LocalIpc.cs b/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.LocalIpc.cs
index 80fcf3a52..b64e96abf 100644
--- a/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.LocalIpc.cs
+++ b/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.LocalIpc.cs
@@ -165,7 +165,8 @@ [.. _agents.Values
                 UsageLimit: a.Status == "Running" ? a.UsageLimit : null,
                 TerminalDialog: a.Status == "Running" ? a.TerminalDialog : null,
                 WorkingSince: a.Status == "Running" && a.ActivityClock.WorkingFor is { } working
-                    ? (_time.GetUtcNow() - working).UtcDateTime : null))];
+                    ? (_time.GetUtcNow() - working).UtcDateTime : null,
+                TurnAttested: a.Status == "Running" && a.ActivityClock.TurnAttested))];
 
     /// The checkout is resolved as the live agent's is, so a row keeps its rail group across the handoff.
     static AgentStatusDto LedgerStatusRow(ResumeLedgerEntry entry, string status) {
diff --git a/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.cs b/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.cs
index 0dc07f6c5..96cbc37d4 100644
--- a/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.cs
+++ b/src/Capacitor.Cli.Daemon/Services/AgentOrchestrator.cs
@@ -2192,6 +2192,7 @@ AgentActivityClock CreateActivityClock() =>
                 _statusNotifier.Pulse();
                 RescheduleQuietTurn();
             },
+            OnTurnAttestedChanged  = _statusNotifier.Pulse,
         };
 
     /// <summary>Test-only seam — insert a minimal <see cref="AgentInstance"/> (Noop
diff --git a/test/Capacitor.App.Tests.Unit/ChatComposerTests.cs b/test/Capacitor.App.Tests.Unit/ChatComposerTests.cs
index 4352c5c9d..3847cab25 100644
--- a/test/Capacitor.App.Tests.Unit/ChatComposerTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatComposerTests.cs
@@ -261,7 +261,7 @@ await RunOnUiAsync(async () => {
                 await Assert.That(interruptButton.IsEffectivelyVisible).IsFalse();
                 await Assert.That(chat.ComposerHint).IsEqualTo("Enter sends · Shift+Enter for a new line");
 
-                daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true, repoPath: "/repo") with { Status = "Running", AwaitingInput = false });
+                daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true, repoPath: "/repo") with { Status = "Running", AwaitingInput = false, TurnAttested = true });
                 Dispatcher.UIThread.RunJobs();
                 window.UpdateLayout();
 
diff --git a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
index b178cab57..910dda4a3 100644
--- a/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
+++ b/test/Capacitor.App.Tests.Unit/ChatTabViewSmokeTests.cs
@@ -952,7 +952,9 @@ await RunOnUiAsync(async () => {
             try {
                 var path = Tmp.CreateFile("escape.jsonl", [UserLine]);
                 var client = await host.AttachAsync(path);
-                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with { TranscriptPath = path, Status = "Running", AwaitingInput = false });
+                host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false, TurnAttested = true,
+                });
                 host.Type("keep this draft");
                 host.Chat.Tray.AddAll([new StagedAttachment("notes.txt", "text/plain", new byte[] { 1 })]);
                 if (button) Click(host, host.View.FindControl<Button>("InterruptButton")!);
@@ -967,34 +969,48 @@ await RunOnUiAsync(async () => {
         });
     }
 
+    /// A Working status is not proof of a turn: an idle PTY prompt reports AwaitingInput false
+    /// until a Stop lands. The button stays, so the shortcut's own gate is what keeps Escape off it.
     [Test]
-    [Arguments(null, 0)]
-    [Arguments(true, 0)]
-    [Arguments(true, 1)]
+    [Arguments(false, null, 0)]
+    [Arguments(false, false, 0)]
+    [Arguments(true, false, 1)]
     [NotInParallel("AvaloniaSession")]
-    public async Task Escape_does_not_reach_a_prompt_without_a_confirmed_foreground_turn(bool? awaitingInput, int liveSubagents) {
+    public async Task Escape_does_not_reach_a_prompt_without_a_confirmed_foreground_turn(
+            bool? awaitingInput, bool? turnAttested, int liveSubagents) {
         await RunOnUiAsync(async () => {
             var host = new Host();
             try {
                 var path = Tmp.CreateFile("escape-idle.jsonl", [UserLine]);
                 var client = await host.AttachAsync(path);
+                var ancestorSawEscape = false;
+                host.Window.KeyDown += (_, e) => ancestorSawEscape |= e.Key == Key.Escape;
                 host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
-                    TranscriptPath = path, Status = "Running", AwaitingInput = awaitingInput, LiveSubagents = liveSubagents,
+                    TranscriptPath = path, Status = "Running", AwaitingInput = awaitingInput, TurnAttested = turnAttested,
+                    LiveSubagents = liveSubagents,
                 });
+                host.Settle();
+                await Assert.That(host.Chat.ShowsInterrupt).IsTrue();
+                await Assert.That(host.Chat.CanInterruptWithEscape).IsFalse();
+                await Assert.That(host.View.FindControl<Button>("InterruptButton")!.Content).IsEqualTo("Interrupt");
                 host.Type("keep this draft");
                 host.Press(PhysicalKey.Escape);
                 await Assert.That(client.SentInput).IsEmpty();
+                await Assert.That(ancestorSawEscape).IsFalse();
                 await Assert.That(host.Composer.Text).IsEqualTo("keep this draft");
-                // A known working turn may be interrupted; the same shortcut goes inert as soon as it ends.
+                // An attested turn may be interrupted; the same shortcut goes inert as soon as it ends.
                 host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
-                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false, TurnAttested = true,
+                    LiveSubagents = liveSubagents,
                 });
                 host.Settle();
+                await Assert.That(host.View.FindControl<Button>("InterruptButton")!.Content).IsEqualTo("Interrupt (Esc)");
                 host.Press(PhysicalKey.Escape);
                 await Assert.That(client.SentInput).Count().IsEqualTo(1);
                 await Assert.That(client.SentInput[0]).IsEquivalentTo(new byte[] { 0x1b });
                 host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
-                    TranscriptPath = path, Status = "Running", AwaitingInput = true,
+                    TranscriptPath = path, Status = "Running", AwaitingInput = true, TurnAttested = false,
+                    LiveSubagents = liveSubagents,
                 });
                 host.Settle();
                 host.Press(PhysicalKey.Escape);
@@ -1014,8 +1030,10 @@ await RunOnUiAsync(async () => {
                 var path = Tmp.CreateFile("escape-child.jsonl", [UserLine]);
                 var client = await host.AttachAsync(path);
                 host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
-                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false, TurnAttested = true,
                 });
+                host.Settle();
+                await Assert.That(host.Chat.CanInterruptWithEscape).IsTrue();
                 host.Type("keep this draft");
                 var consumed = false;
                 host.Composer.KeyDown += (_, e) => {
@@ -1040,8 +1058,10 @@ await RunOnUiAsync(async () => {
                 var path = Tmp.CreateFile("escape-menu.jsonl", [UserLine]);
                 var client = await host.AttachAsync(path);
                 host.Daemon.Agents.AddOrUpdate(Agent("a1", "claude", hasTerminal: true) with {
-                    TranscriptPath = path, Status = "Running", AwaitingInput = false,
+                    TranscriptPath = path, Status = "Running", AwaitingInput = false, TurnAttested = true,
                 });
+                host.Settle();
+                await Assert.That(host.Chat.CanInterruptWithEscape).IsTrue();
                 host.Type("keep this draft");
                 var item = new MenuItem { Header = "Copy" };
                 var menu = new ContextMenu { ItemsSource = new[] { item } };
diff --git a/test/Capacitor.App.Tests.Unit/SessionStatusDotsTests.cs b/test/Capacitor.App.Tests.Unit/SessionStatusDotsTests.cs
index 7a4be1c9b..c0c5240f8 100644
--- a/test/Capacitor.App.Tests.Unit/SessionStatusDotsTests.cs
+++ b/test/Capacitor.App.Tests.Unit/SessionStatusDotsTests.cs
@@ -21,6 +21,21 @@ public async Task Is_working_across_the_verdict_and_the_count(string status, boo
         await Assert.That(SessionStatusDots.IsWorking(status, awaitingInput, liveSubagents)).IsEqualTo(expected);
     }
 
+    /// Working is not a foreground turn on its own; it takes the daemon's attestation, and a
+    /// pending card outranks both.
+    [Test]
+    [Arguments(false, true, false, true)]
+    [Arguments(false, false, false, false)]
+    [Arguments(true, true, false, false)]
+    [Arguments(false, true, true, false)]
+    public async Task A_foreground_turn_needs_working_and_the_daemons_attestation(
+            bool awaitingInput, bool turnAttested, bool pending, bool expected) {
+        var status = SessionStatusDots.Present("Running", awaitingInput, waitsOnUser: false, liveSubagents: null, pending,
+            usageLimitSummary: null, launchStage: null, elapsed: null, turnAttested: turnAttested);
+
+        await Assert.That(status.InForegroundTurn).IsEqualTo(expected);
+    }
+
     [Test]
     public async Task A_remote_row_carries_no_count_and_never_works_by_it() {
         var row = AgentRow.FromRemote(new AgentInstanceDto {
diff --git a/test/Capacitor.Cli.Core.Tests.Unit/LocalIpc/StatusIpcJsonTests.cs b/test/Capacitor.Cli.Core.Tests.Unit/LocalIpc/StatusIpcJsonTests.cs
index 2c16c0639..8d309293d 100644
--- a/test/Capacitor.Cli.Core.Tests.Unit/LocalIpc/StatusIpcJsonTests.cs
+++ b/test/Capacitor.Cli.Core.Tests.Unit/LocalIpc/StatusIpcJsonTests.cs
@@ -29,7 +29,7 @@ public async Task DaemonStatus_serializes_exactly_with_nulls_present_and_pinned_
         var json = JsonSerializer.Serialize(dto, StatusIpcJsonContext.Default.DaemonStatusDto);
 
         await Assert.That(json).IsEqualTo(
-            """{"daemon":{"name":"main","version":"0.12.3","server_url":"https://tenant.example.com","connection":"connected","max_agents":5,"active_agents":1,"pid":4242,"instance_id":"inst-abc","supported_vendors":null,"vendor_models":null,"credential":null,"profile":null},"agents":[{"id":"agent-abc123","kind":"review-flow","vendor":"codex","repo_path":"/Users/x/dev/repo","status":"Live","flow_run_id":"flow_1","flow_role":"reviewer","requester":"github:12345","created_at":"2026-08-01T12:34:56.789Z","model":"gpt-5-codex","requester_display":"Ada Lovelace","has_terminal":null,"title":"Fix the flaky test","transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null},{"id":"agent-b","kind":"agent","vendor":"claude","repo_path":null,"status":"Starting","flow_run_id":null,"flow_role":null,"requester":null,"created_at":"2026-08-01T12:35:00Z","model":null,"requester_display":null,"has_terminal":null,"title":null,"transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}],"pending":null,"busy":null}""");
+            """{"daemon":{"name":"main","version":"0.12.3","server_url":"https://tenant.example.com","connection":"connected","max_agents":5,"active_agents":1,"pid":4242,"instance_id":"inst-abc","supported_vendors":null,"vendor_models":null,"credential":null,"profile":null},"agents":[{"id":"agent-abc123","kind":"review-flow","vendor":"codex","repo_path":"/Users/x/dev/repo","status":"Live","flow_run_id":"flow_1","flow_role":"reviewer","requester":"github:12345","created_at":"2026-08-01T12:34:56.789Z","model":"gpt-5-codex","requester_display":"Ada Lovelace","has_terminal":null,"title":"Fix the flaky test","transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null},{"id":"agent-b","kind":"agent","vendor":"claude","repo_path":null,"status":"Starting","flow_run_id":null,"flow_role":null,"requester":null,"created_at":"2026-08-01T12:35:00Z","model":null,"requester_display":null,"has_terminal":null,"title":null,"transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}],"pending":null,"busy":null}""");
     }
 
     [Test]
@@ -107,8 +107,8 @@ public async Task Transcript_path_serializes_after_title_and_null_is_emitted() {
         var json = JsonSerializer.Serialize(withPath, StatusIpcJsonContext.Default.AgentStatusDto);
         var jsonNull = JsonSerializer.Serialize(without, StatusIpcJsonContext.Default.AgentStatusDto);
 
-        await Assert.That(json).EndsWith(""","has_terminal":true,"title":"t","transcript_path":"/home/u/.claude/projects/-repo/abc.jsonl","worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(jsonNull).EndsWith(""","has_terminal":true,"title":"t","transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(json).EndsWith(""","has_terminal":true,"title":"t","transcript_path":"/home/u/.claude/projects/-repo/abc.jsonl","worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(jsonNull).EndsWith(""","has_terminal":true,"title":"t","transcript_path":null,"worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     [Test]
@@ -139,8 +139,8 @@ public async Task Checkout_members_serialize_last_and_nulls_are_emitted() {
         var json = JsonSerializer.Serialize(borrowed, StatusIpcJsonContext.Default.AgentStatusDto);
         var jsonNull = JsonSerializer.Serialize(older, StatusIpcJsonContext.Default.AgentStatusDto);
 
-        await Assert.That(json).EndsWith(""","transcript_path":"/x.jsonl","worktree_path":"/repo/.capacitor/worktrees/agent-1","work_location":"borrowed","borrowed_from":"/repo/.capacitor/worktrees/agent-1","session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(jsonNull).EndsWith(""","transcript_path":"/x.jsonl","worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(json).EndsWith(""","transcript_path":"/x.jsonl","worktree_path":"/repo/.capacitor/worktrees/agent-1","work_location":"borrowed","borrowed_from":"/repo/.capacitor/worktrees/agent-1","session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(jsonNull).EndsWith(""","transcript_path":"/x.jsonl","worktree_path":null,"work_location":null,"borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     [Test]
@@ -174,8 +174,8 @@ public async Task Session_and_branch_members_serialize_last_and_nulls_are_emitte
         var json = JsonSerializer.Serialize(full, StatusIpcJsonContext.Default.AgentStatusDto);
         var jsonNull = JsonSerializer.Serialize(older, StatusIpcJsonContext.Default.AgentStatusDto);
 
-        await Assert.That(json).EndsWith(""","borrowed_from":null,"session_id":"0123456789abcdef0123456789abcdef","branch":"feature/sidebar","awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(jsonNull).EndsWith(""","borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(json).EndsWith(""","borrowed_from":null,"session_id":"0123456789abcdef0123456789abcdef","branch":"feature/sidebar","awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(jsonNull).EndsWith(""","borrowed_from":null,"session_id":null,"branch":null,"awaiting_input":null,"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     /// The daemon's own verdict on whether the agent finished its turn and waits on the user; an
@@ -191,7 +191,7 @@ public async Task Awaiting_input_serializes_before_transcript_format_and_never_o
 
         var json = JsonSerializer.Serialize(dto, StatusIpcJsonContext.Default.AgentStatusDto);
 
-        await Assert.That(json).EndsWith($$$""","branch":"main","awaiting_input":{{{value.ToString().ToLowerInvariant()}}},"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(json).EndsWith($$$""","branch":"main","awaiting_input":{{{value.ToString().ToLowerInvariant()}}},"transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     [Test]
@@ -227,9 +227,9 @@ public async Task Transcript_format_serializes_before_live_subagents_and_always_
         var envelopes = vendor with { TranscriptFormat = TranscriptFormats.Envelopes };
         var unset     = vendor with { TranscriptFormat = null };
 
-        await Assert.That(JsonSerializer.Serialize(vendor, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","awaiting_input":null,"transcript_format":"vendor","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(JsonSerializer.Serialize(envelopes, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"envelopes","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(JsonSerializer.Serialize(unset, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(JsonSerializer.Serialize(vendor, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","awaiting_input":null,"transcript_format":"vendor","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(JsonSerializer.Serialize(envelopes, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"envelopes","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(JsonSerializer.Serialize(unset, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":null,"live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     [Test]
@@ -248,9 +248,9 @@ public async Task Live_subagents_serializes_before_usage_limit_and_both_are_alwa
         var zero     = unset with { LiveSubagents = 0 };
         var positive = unset with { LiveSubagents = 3 };
 
-        await Assert.That(JsonSerializer.Serialize(unset, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(JsonSerializer.Serialize(zero, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":0,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
-        await Assert.That(JsonSerializer.Serialize(positive, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":3,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null}""");
+        await Assert.That(JsonSerializer.Serialize(unset, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":null,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(JsonSerializer.Serialize(zero, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":0,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
+        await Assert.That(JsonSerializer.Serialize(positive, StatusIpcJsonContext.Default.AgentStatusDto)).EndsWith(""","transcript_format":"vendor","live_subagents":3,"usage_limit":null,"terminal_dialog":null,"interruption":null,"working_since":null,"turn_attested":null}""");
     }
 
     [Test]
@@ -301,8 +301,21 @@ public async Task Interruption_roundtrips_and_is_null_from_an_older_daemon() {
         var json = JsonSerializer.Serialize(dto, StatusIpcJsonContext.Default.AgentStatusDto);
         var old  = """{"id":"a","kind":"agent","vendor":"claude","repo_path":null,"status":"Running","flow_run_id":null,"flow_role":null,"requester":null,"created_at":"2026-08-01T00:00:00Z","model":null,"requester_display":null}""";
 
-        await Assert.That(json).EndsWith("\"interruption\":\"too_old\",\"working_since\":null}");
+        await Assert.That(json).EndsWith("\"interruption\":\"too_old\",\"working_since\":null,\"turn_attested\":null}");
         await Assert.That(JsonSerializer.Deserialize(json, StatusIpcJsonContext.Default.AgentStatusDto)!.Interruption).IsEqualTo("too_old");
         await Assert.That(JsonSerializer.Deserialize(old, StatusIpcJsonContext.Default.AgentStatusDto)!.Interruption).IsNull();
     }
+
+    [Test]
+    public async Task TurnAttested_roundtrips_and_is_null_from_an_older_daemon() {
+        var dto = new AgentStatusDto("a", "agent", "claude", null, "Running", null, null, null, DateTime.UnixEpoch, null, null,
+            TurnAttested: true);
+
+        var json = JsonSerializer.Serialize(dto, StatusIpcJsonContext.Default.AgentStatusDto);
+        var old  = """{"id":"a","kind":"agent","vendor":"claude","repo_path":null,"status":"Running","flow_run_id":null,"flow_role":null,"requester":null,"created_at":"2026-08-01T00:00:00Z","model":null,"requester_display":null,"awaiting_input":false}""";
+
+        await Assert.That(json).EndsWith("\"turn_attested\":true}");
+        await Assert.That(JsonSerializer.Deserialize(json, StatusIpcJsonContext.Default.AgentStatusDto)!.TurnAttested).IsTrue();
+        await Assert.That(JsonSerializer.Deserialize(old, StatusIpcJsonContext.Default.AgentStatusDto)!.TurnAttested).IsNull();
+    }
 }
diff --git a/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentActivityClockTests.cs b/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentActivityClockTests.cs
index d63ae7b9d..9d721d0bd 100644
--- a/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentActivityClockTests.cs
+++ b/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentActivityClockTests.cs
@@ -276,6 +276,56 @@ public async Task SetAwaitingInput_moves_only_the_flag_and_notifies_once_per_cha
         await Assert.That(notified).IsEqualTo(2);
     }
 
+    /// A fresh launch and a cleared wait both read AwaitingInput false at an idle prompt, so
+    /// neither may attest a turn. Only a relayed submit or tool call does, until a turn end.
+    [Test]
+    public async Task Only_a_relayed_submit_attests_a_PTY_turn_and_a_turn_end_or_quiet_mark_retracts_it() {
+        var time     = new FakeTimeProvider();
+        var clock    = new AgentActivityClock(time);
+        var notified = 0;
+        clock.OnTurnAttestedChanged = () => notified++;
+
+        await Assert.That(clock.AwaitingInput).IsFalse();
+        await Assert.That(clock.TurnAttested).IsFalse();
+
+        clock.SetAwaitingInput(true);
+        clock.ClearAwaitingInputSince(clock.WaitGeneration);
+        clock.Advance();
+        await Assert.That(clock.AwaitingInput).IsFalse();
+        await Assert.That(clock.TurnAttested).IsFalse();
+        await Assert.That(notified).IsEqualTo(0);
+
+        clock.SetAwaitingInput(false);
+        await Assert.That(clock.TurnAttested).IsTrue();
+        clock.SetAwaitingInput(false);
+        await Assert.That(notified).IsEqualTo(1);
+
+        clock.SetAwaitingInput(true);
+        await Assert.That(clock.TurnAttested).IsFalse();
+        await Assert.That(notified).IsEqualTo(2);
+
+        clock.SetAwaitingInput(false);
+        time.Advance(AgentActivityClock.QuietTurn);
+        await Assert.That(clock.TryMarkQuiet(AgentActivityClock.QuietTurn)).IsTrue();
+        await Assert.That(clock.TurnAttested).IsFalse();
+        clock.Advance();
+        await Assert.That(clock.TurnAttested).IsFalse();
+        await Assert.That(notified).IsEqualTo(4);
+    }
+
+    [Test]
+    public async Task An_ACP_turn_gate_attests_a_turn_while_it_is_held() {
+        var clock    = new AgentActivityClock(new FakeTimeProvider());
+        var notified = 0;
+        clock.OnTurnAttestedChanged = () => notified++;
+
+        clock.SetTurnInFlight(true);
+        await Assert.That(clock.TurnAttested).IsTrue();
+        clock.SetTurnInFlight(false);
+        await Assert.That(clock.TurnAttested).IsFalse();
+        await Assert.That(notified).IsEqualTo(2);
+    }
+
     /// A delivery clears the wait it was answering, never one that began while the delivery was
     /// still in flight.
     [Test]
diff --git a/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentStatusSnapshotTests.cs b/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentStatusSnapshotTests.cs
index 01b8ea582..2e5e9bd8b 100644
--- a/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentStatusSnapshotTests.cs
+++ b/test/Capacitor.Cli.Daemon.Tests.Unit/Services/AgentStatusSnapshotTests.cs
@@ -426,6 +426,28 @@ string Json(string id) => JsonSerializer.Serialize(
         } finally { await fx.CleanupAsync(); }
     }
 
+    /// A relayed submit can attest a turn while the wait is already clear, so the attestation
+    /// pulses on its own; the wait flag alone would leave the app unaware the turn began.
+    [Test]
+    public async Task A_relayed_submit_attests_the_turn_on_the_wire_and_pulses_while_running() {
+        var fx = Build();
+        try {
+            var running = fx.Orchestrator.SeedAgentForTest("run");
+            var done    = fx.Orchestrator.SeedAgentForTest("done", status: "Completed");
+            string Json(string id) => JsonSerializer.Serialize(
+                fx.Orchestrator.SnapshotAgentsForStatus().Single(a => a.Id == id), StatusIpcJsonContext.Default.AgentStatusDto);
+            await Assert.That(Json("run")).Contains("\"turn_attested\":false");
+
+            var v0 = fx.Notifier.Version;
+            running.ActivityClock.SetAwaitingInput(false);
+            done.ActivityClock.SetAwaitingInput(false);
+
+            await Assert.That(fx.Notifier.Version).IsGreaterThan(v0);
+            await Assert.That(Json("run")).Contains("\"turn_attested\":true");
+            await Assert.That(Json("done")).Contains("\"turn_attested\":false");
+        } finally { await fx.CleanupAsync(); }
+    }
+
     /// A turn ending is a status change the app must see without waiting for another mutation,
     /// so the launch-path clock wiring pulses the generation on every flip.
     [Test]