From 0e228dec18b2a1f8a81192df07be03a789fbbb19 Mon Sep 17 00:00:00 2001
From: m57 <41645758+Hy4ri@users.noreply.github.com>
Date: Fri, 25 Sep 2026 15:50:12 +0300
Subject: [PATCH] fix(chat): preserve local command transcript anchor (#1261)

---
 .../com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
index a04c7951..474b164b 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
@@ -537,7 +537,11 @@ private fun List<ChatMessage>.inTranscriptOrder(
                     Long.MAX_VALUE
                 } else {
                     precedingCanonical?.takeIf { it >= 0L }
-                        ?: latestCanonical
+                        ?: if (message.role == MessageRole.USER) {
+                            precedingCanonical ?: latestCanonical
+                        } else {
+                            latestCanonical
+                        }
                 }
             if (hasPendingPredecessor) pendingOrderByLocal[message.id] = pendingLocalOrder ?: Long.MAX_VALUE
         } else if (message.isHistoricalCache || message.isRestoredUnconfirmed) {