From 427be22049f36d952af03ad64bee975f54479471 Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Mon, 24 Aug 2026 14:08:13 -0700
Subject: [PATCH 1/3] fix(web): keep remote icon visible on hover

---
 apps/web/src/components/LegacySidebar.tsx | 38 +++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 55bbcea60be5..f26942535046 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -931,10 +931,26 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
             </Tooltip>
           )}
           <div
-            className={`flex min-w-12 justify-end ${
+            className={`flex min-w-12 items-center justify-end gap-1 ${
               isRemoteThread ? "max-sm:min-w-24" : "max-sm:min-w-20"
             }`}
           >
+            {showsRemoteThreadIcon && (
+              <Tooltip>
+                <TooltipTrigger
+                  render={
+                    <span
+                      aria-label={threadEnvironmentLabel ?? "Remote"}
+                      className="inline-flex shrink-0 items-center justify-center"
+                      data-legacy-sidebar-unscaled-content
+                    />
+                  }
+                >
+                  <CloudIcon className="size-3 text-muted-foreground/40" />
+                </TooltipTrigger>
+                <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
+              </Tooltip>
+            )}
             {isConfirmingArchive ? (
               <button
                 ref={handleConfirmArchiveRef}
@@ -986,26 +1002,8 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                 </Tooltip>
               )
             ) : null}
-            <span
-              className={`${threadMetaClassName}${showsRemoteThreadIcon ? " flex items-center" : ""}`}
-            >
+            <span className={threadMetaClassName}>
               <span className="inline-flex items-center gap-1">
-                {showsRemoteThreadIcon && (
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={
-                        <span
-                          aria-label={threadEnvironmentLabel ?? "Remote"}
-                          className="inline-flex items-center justify-center"
-                          data-legacy-sidebar-unscaled-content
-                        />
-                      }
-                    >
-                      <CloudIcon className="size-3 text-muted-foreground/40" />
-                    </TooltipTrigger>
-                    <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
-                  </Tooltip>
-                )}
                 {jumpLabel ? (
                   hasActiveAnnotation && thread.annotation ? (
                     <ThreadAnnotationHoverPopover

From 1d8b1485ec75d82130dd507fead3e02e43e7dcfd Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Mon, 24 Aug 2026 14:24:29 -0700
Subject: [PATCH 2/3] fix(web): avoid archive confirmation overlap

---
 apps/web/src/components/LegacySidebar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index f26942535046..a32fc40813f4 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -935,7 +935,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               isRemoteThread ? "max-sm:min-w-24" : "max-sm:min-w-20"
             }`}
           >
-            {showsRemoteThreadIcon && (
+            {showsRemoteThreadIcon && !isConfirmingArchive && (
               <Tooltip>
                 <TooltipTrigger
                   render={

From 891be0a27cba61af197a146203fb6a99ce94cfaa Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Mon, 24 Aug 2026 14:38:08 -0700
Subject: [PATCH 3/3] fix(web): preserve remote indicator spacing

---
 apps/web/src/components/LegacySidebar.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index a32fc40813f4..b57ce6c11530 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -935,13 +935,15 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               isRemoteThread ? "max-sm:min-w-24" : "max-sm:min-w-20"
             }`}
           >
-            {showsRemoteThreadIcon && !isConfirmingArchive && (
+            {showsRemoteThreadIcon && (
               <Tooltip>
                 <TooltipTrigger
                   render={
                     <span
                       aria-label={threadEnvironmentLabel ?? "Remote"}
-                      className="inline-flex shrink-0 items-center justify-center"
+                      className={`inline-flex shrink-0 items-center justify-center ${
+                        isConfirmingArchive ? "invisible" : ""
+                      }`}
                       data-legacy-sidebar-unscaled-content
                     />
                   }