From 884de0c2b7ce87a77d3224c8c93502385e7ccb7c Mon Sep 17 00:00:00 2001
From: LHagfoss <lucash.1707@outlook.com>
Date: Sun, 15 Nov 2026 15:44:23 +0100
Subject: [PATCH] fix(desktop): keep a message's Edit and Retry while a turn
 runs

Edit and Retry were removed from a sent message while its thread ran, leaving Copy alone beside a gap, so the same message had different actions depending on state the user could not see. They now stay in place, dimmed, with a tooltip that says to stop the turn first.
---
 apps/desktop/src/ui/Rows.tsx       | 35 +++++++++++++++++++++++++-----
 apps/desktop/src/ui/Transcript.tsx |  3 ++-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/ui/Rows.tsx b/apps/desktop/src/ui/Rows.tsx
index ecf6f511b..6330e8011 100644
--- a/apps/desktop/src/ui/Rows.tsx
+++ b/apps/desktop/src/ui/Rows.tsx
@@ -100,15 +100,28 @@ function messageMarkdown(text: string): string {
   return slash ? `\`${COMMAND_MARK}${slash.command}\` ${slash.rest}` : text;
 }
 
+/**
+ * A message's Edit and Retry: shown on hover with Copy, and dimmed rather than removed while a
+ * turn runs (`aria-disabled` keeps the tooltip that says why).
+ */
+const MESSAGE_ACTION =
+  "inline-flex size-[22px] items-center justify-center rounded-md text-fg-muted opacity-0 transition-opacity hover:bg-fill hover:text-fg focus-visible:opacity-100 group-hover:opacity-100 aria-disabled:cursor-default aria-disabled:text-fg-faint aria-disabled:hover:bg-transparent aria-disabled:hover:text-fg-faint";
+
 export const UserRow = memo(function UserRow({
   item,
   threadId,
+  busy,
   rewind,
   before,
   after,
 }: {
   item: Item<"user">;
   threadId?: string;
+  /**
+   * A turn runs: Edit and Retry keep their place but are off until it ends, so the message's
+   * actions are the same three whether the thread runs or not.
+   */
+  busy?: boolean;
   /** Edit and Retry take the thread back to this message (`_rustcode/rewind`). */
   rewind?: boolean;
   /** The message after this one is the sender's too. */
@@ -258,24 +271,34 @@ export const UserRow = memo(function UserRow({
           <>
             <Tooltip
               label={
-                rewind ? "Edit and resend: the thread goes back to this message" : "Edit in the composer"
+                busy
+                  ? "Stop the turn to edit"
+                  : rewind
+                    ? "Edit and resend: the thread goes back to this message"
+                    : "Edit in the composer"
               }
             >
               <button
                 type="button"
                 aria-label="Edit message"
-                onClick={() => editMessage(threadId, item.id)}
-                className="inline-flex size-[22px] items-center justify-center rounded-md text-fg-muted opacity-0 transition-opacity hover:bg-fill hover:text-fg focus-visible:opacity-100 group-hover:opacity-100"
+                aria-disabled={busy || undefined}
+                onClick={() => !busy && editMessage(threadId, item.id)}
+                className={MESSAGE_ACTION}
               >
                 <Pencil size={12} />
               </button>
             </Tooltip>
-            <Tooltip label={rewind ? "Retry: send it again from here" : "Send it again"}>
+            <Tooltip
+              label={
+                busy ? "Stop the turn to retry" : rewind ? "Retry: send it again from here" : "Send it again"
+              }
+            >
               <button
                 type="button"
                 aria-label="Retry message"
-                onClick={() => retryMessage(threadId, item.id)}
-                className="inline-flex size-[22px] items-center justify-center rounded-md text-fg-muted opacity-0 transition-opacity hover:bg-fill hover:text-fg focus-visible:opacity-100 group-hover:opacity-100"
+                aria-disabled={busy || undefined}
+                onClick={() => !busy && retryMessage(threadId, item.id)}
+                className={MESSAGE_ACTION}
               >
                 <RotateCcw size={12} />
               </button>
diff --git a/apps/desktop/src/ui/Transcript.tsx b/apps/desktop/src/ui/Transcript.tsx
index 26d4bc8bd..09c9b8dc5 100644
--- a/apps/desktop/src/ui/Transcript.tsx
+++ b/apps/desktop/src/ui/Transcript.tsx
@@ -1414,7 +1414,8 @@ export function Transcript({
                       <SelectableMessage threadId={thread.id}>
                         <UserRow
                           item={item}
-                          threadId={thread.running || peek ? undefined : thread.id}
+                          threadId={peek ? undefined : thread.id}
+                          busy={thread.running}
                           rewind={rewind}
                           // Consecutive messages from the same side soften the corners they share.
                           after={rows[v.index - 1]?.item?.kind === "user"}