From 4d32bda7c5c16bc7aed7790922c041862bcc8562 Mon Sep 17 00:00:00 2001
From: Ammar <ammar+ai@ammar.io>
Date: Sun, 7 Dec 2025 10:29:03 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20fix:=20hide=20X=20button=20durin?=
 =?UTF-8?q?g=20workspace=20rename=20to=20avoid=20confusion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The X button showed 'Remove workspace' tooltip during rename mode,
causing accidental workspace deletion. Now the X button is hidden
while editing - users can press Escape to cancel rename instead.

Also prevents Escape key from propagating to global stream interrupt
handler.
---
 src/browser/components/WorkspaceListItem.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/WorkspaceListItem.tsx b/src/browser/components/WorkspaceListItem.tsx
index bf135bea06..2f9fdb3aec 100644
--- a/src/browser/components/WorkspaceListItem.tsx
+++ b/src/browser/components/WorkspaceListItem.tsx
@@ -91,7 +91,9 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
       e.preventDefault();
       void handleConfirmRename();
     } else if (e.key === "Escape") {
+      // Stop propagation to prevent global Escape handler from interrupting stream
       e.preventDefault();
+      e.stopPropagation();
       handleCancelRename();
     }
   };
@@ -188,7 +190,7 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
             )}
 
             <div className="flex items-center gap-1">
-              {!isCreating && (
+              {!isCreating && !isEditing && (
                 <>
                   <GitStatusIndicator
                     gitStatus={gitStatus}