From c482c93da2f3f6b3478d1c59d86399bda19a003f Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Wed, 26 Aug 2026 12:44:50 -0700
Subject: [PATCH 1/6] fix(web): align legacy thread metadata columns

---
 apps/web/src/components/LegacySidebar.tsx | 36 +++++++++++++++--------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 0f4201390dae..57145099f624 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -577,10 +577,10 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
     />
   );
   const threadMetaClassName = isConfirmingArchive
-    ? "pointer-events-none opacity-0"
+    ? "pointer-events-none inline-flex w-12 justify-end opacity-0"
     : !isThreadRunning
-      ? "pointer-events-none transition-opacity duration-150 max-sm:pr-6 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
-      : "pointer-events-none";
+      ? "pointer-events-none inline-flex w-12 justify-end transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
+      : "pointer-events-none inline-flex w-12 justify-end";
   const [threadRowActive, setThreadRowActive] = useState(false);
   const clearConfirmingArchive = useCallback(() => {
     setConfirmingArchiveThreadKey((current) => (current === threadKey ? null : current));
@@ -937,7 +937,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
           )}
         </div>
         <div className="ml-auto flex shrink-0 items-center gap-1.5">
-          {cleanup === null && discoveredPorts.length > 0 && (
+          {cleanup === null && discoveredPorts.length > 0 ? (
             <Tooltip>
               <TooltipTrigger
                 render={
@@ -956,9 +956,8 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                 {discoveredPorts.length > 1 ? ` (+${discoveredPorts.length - 1})` : ""}
               </TooltipPopup>
             </Tooltip>
-          )}
-          {props.showWorktreeIndicators ? <ThreadWorktreeIndicator thread={thread} /> : null}
-          {terminalStatus && (
+          ) : null}
+          {terminalStatus ? (
             <Tooltip>
               <TooltipTrigger
                 render={
@@ -975,13 +974,24 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               </TooltipTrigger>
               <TooltipPopup side="top">{terminalStatus.label}</TooltipPopup>
             </Tooltip>
-          )}
+          ) : null}
+          {/* These fixed tracks are the scanning columns for every thread row.
+              Empty local/worktree cells stay mounted, and the timestamp cannot
+              widen the grid and push either icon sideways. */}
           <div
-            className={`flex min-w-12 items-center justify-end gap-1 ${
-              isRemoteThread ? "max-sm:min-w-24" : "max-sm:min-w-20"
-            }`}
+            className="grid shrink-0 grid-cols-[repeat(2,0.75rem)_3rem] items-center gap-x-1 max-sm:grid-cols-[repeat(2,0.75rem)_3rem_1.5rem]"
+            data-testid={`thread-metadata-grid-${thread.id}`}
           >
-            <span className="inline-flex size-3 shrink-0 items-center justify-center">
+            <span
+              className="inline-flex size-3 items-center justify-center"
+              data-thread-metadata-column="worktree"
+            >
+              {props.showWorktreeIndicators ? <ThreadWorktreeIndicator thread={thread} /> : null}
+            </span>
+            <span
+              className="inline-flex size-3 items-center justify-center"
+              data-thread-metadata-column="environment"
+            >
               {showsThreadEnvironmentIcon ? (
                 <Tooltip>
                   <TooltipTrigger
@@ -1057,7 +1067,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                 </Tooltip>
               )
             ) : null}
-            <span className={threadMetaClassName}>
+            <span className={threadMetaClassName} data-thread-metadata-column="timestamp">
               <span className="inline-flex items-center gap-1">
                 {jumpLabel ? (
                   hasActiveAnnotation && thread.annotation ? (

From 4b6bb2cde77d4534122b9ff0d6f98ba53998dafe Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Thu, 27 Aug 2026 01:18:45 -0700
Subject: [PATCH 2/6] fix(web): preserve sidebar icon spacing when scaled

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

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 57145099f624..b324981fda18 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -577,10 +577,10 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
     />
   );
   const threadMetaClassName = isConfirmingArchive
-    ? "pointer-events-none inline-flex w-12 justify-end opacity-0"
+    ? "pointer-events-none inline-flex w-full justify-end opacity-0"
     : !isThreadRunning
-      ? "pointer-events-none inline-flex w-12 justify-end transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
-      : "pointer-events-none inline-flex w-12 justify-end";
+      ? "pointer-events-none inline-flex w-full justify-end transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
+      : "pointer-events-none inline-flex w-full justify-end";
   const [threadRowActive, setThreadRowActive] = useState(false);
   const clearConfirmingArchive = useCallback(() => {
     setConfirmingArchiveThreadKey((current) => (current === threadKey ? null : current));
@@ -979,17 +979,17 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               Empty local/worktree cells stay mounted, and the timestamp cannot
               widen the grid and push either icon sideways. */}
           <div
-            className="grid shrink-0 grid-cols-[repeat(2,0.75rem)_3rem] items-center gap-x-1 max-sm:grid-cols-[repeat(2,0.75rem)_3rem_1.5rem]"
+            className="grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]"
             data-testid={`thread-metadata-grid-${thread.id}`}
           >
             <span
-              className="inline-flex size-3 items-center justify-center"
+              className="inline-flex h-3 w-full items-center justify-center"
               data-thread-metadata-column="worktree"
             >
               {props.showWorktreeIndicators ? <ThreadWorktreeIndicator thread={thread} /> : null}
             </span>
             <span
-              className="inline-flex size-3 items-center justify-center"
+              className="inline-flex h-3 w-full items-center justify-center"
               data-thread-metadata-column="environment"
             >
               {showsThreadEnvironmentIcon ? (

From d554b9afca59e903d6ebd2289d4cdf51760e6937 Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Thu, 27 Aug 2026 01:44:41 -0700
Subject: [PATCH 3/6] fix(web): keep jump hints clear of metadata icons

---
 apps/web/src/components/LegacySidebar.tsx | 27 ++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index b324981fda18..19f70f899c64 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -576,11 +576,14 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
       standalone
     />
   );
-  const threadMetaClassName = isConfirmingArchive
-    ? "pointer-events-none inline-flex w-full justify-end opacity-0"
+  const threadMetaVisibilityClassName = isConfirmingArchive
+    ? "opacity-0"
     : !isThreadRunning
-      ? "pointer-events-none inline-flex w-full justify-end transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
-      : "pointer-events-none inline-flex w-full justify-end";
+      ? "transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
+      : "";
+  const threadMetaClassName = `pointer-events-none inline-flex w-full justify-end ${
+    jumpLabel ? "col-span-3 col-start-1 row-start-1 z-10" : ""
+  } ${threadMetaVisibilityClassName}`;
   const [threadRowActive, setThreadRowActive] = useState(false);
   const clearConfirmingArchive = useCallback(() => {
     setConfirmingArchiveThreadKey((current) => (current === threadKey ? null : current));
@@ -977,7 +980,9 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
           ) : null}
           {/* These fixed tracks are the scanning columns for every thread row.
               Empty local/worktree cells stay mounted, and the timestamp cannot
-              widen the grid and push either icon sideways. */}
+              widen the grid and push either icon sideways. A transient jump
+              hint replaces all three tracks so a custom shortcut cannot paint
+              across visible metadata icons. */}
           <div
             className="grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]"
             data-testid={`thread-metadata-grid-${thread.id}`}
@@ -986,13 +991,15 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               className="inline-flex h-3 w-full items-center justify-center"
               data-thread-metadata-column="worktree"
             >
-              {props.showWorktreeIndicators ? <ThreadWorktreeIndicator thread={thread} /> : null}
+              {jumpLabel === null && props.showWorktreeIndicators ? (
+                <ThreadWorktreeIndicator thread={thread} />
+              ) : null}
             </span>
             <span
               className="inline-flex h-3 w-full items-center justify-center"
               data-thread-metadata-column="environment"
             >
-              {showsThreadEnvironmentIcon ? (
+              {jumpLabel === null && showsThreadEnvironmentIcon ? (
                 <Tooltip>
                   <TooltipTrigger
                     render={
@@ -1067,7 +1074,11 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                 </Tooltip>
               )
             ) : null}
-            <span className={threadMetaClassName} data-thread-metadata-column="timestamp">
+            <span
+              className={threadMetaClassName}
+              data-thread-metadata-column="timestamp"
+              data-thread-metadata-mode={jumpLabel ? "jump" : "timestamp"}
+            >
               <span className="inline-flex items-center gap-1">
                 {jumpLabel ? (
                   hasActiveAnnotation && thread.annotation ? (

From 1ed09c7773aab358ca8e184dbac260fb4f4105f3 Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Thu, 27 Aug 2026 02:05:57 -0700
Subject: [PATCH 4/6] fix(web): keep jump hints in one grid row

---
 apps/web/src/components/LegacySidebar.tsx | 85 ++++++++++++-----------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 19f70f899c64..0abc0800da9a 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -979,50 +979,55 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
             </Tooltip>
           ) : null}
           {/* These fixed tracks are the scanning columns for every thread row.
-              Empty local/worktree cells stay mounted, and the timestamp cannot
-              widen the grid and push either icon sideways. A transient jump
-              hint replaces all three tracks so a custom shortcut cannot paint
-              across visible metadata icons. */}
+              Empty local/worktree cells stay mounted for ordinary timestamps,
+              which cannot widen the grid and push either icon sideways. A
+              transient jump hint replaces all three cells and tracks so a
+              custom shortcut cannot paint across visible metadata icons or
+              create an implicit grid row. */}
           <div
             className="grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]"
             data-testid={`thread-metadata-grid-${thread.id}`}
           >
-            <span
-              className="inline-flex h-3 w-full items-center justify-center"
-              data-thread-metadata-column="worktree"
-            >
-              {jumpLabel === null && props.showWorktreeIndicators ? (
-                <ThreadWorktreeIndicator thread={thread} />
-              ) : null}
-            </span>
-            <span
-              className="inline-flex h-3 w-full items-center justify-center"
-              data-thread-metadata-column="environment"
-            >
-              {jumpLabel === null && showsThreadEnvironmentIcon ? (
-                <Tooltip>
-                  <TooltipTrigger
-                    render={
-                      <span
-                        aria-label={threadEnvironmentLabel ?? "Remote"}
-                        className={`inline-flex shrink-0 items-center justify-center ${
-                          isConfirmingArchive ? "invisible" : ""
-                        }`}
-                        data-legacy-sidebar-unscaled-content
-                      />
-                    }
-                  >
-                    <EnvironmentIcon
-                      kind={threadEnvironmentIconKind}
-                      context="legacy-row"
-                      color={environmentIconColor}
-                      className="size-3"
-                    />
-                  </TooltipTrigger>
-                  <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
-                </Tooltip>
-              ) : null}
-            </span>
+            {jumpLabel === null ? (
+              <>
+                <span
+                  className="inline-flex h-3 w-full items-center justify-center"
+                  data-thread-metadata-column="worktree"
+                >
+                  {props.showWorktreeIndicators ? (
+                    <ThreadWorktreeIndicator thread={thread} />
+                  ) : null}
+                </span>
+                <span
+                  className="inline-flex h-3 w-full items-center justify-center"
+                  data-thread-metadata-column="environment"
+                >
+                  {showsThreadEnvironmentIcon ? (
+                    <Tooltip>
+                      <TooltipTrigger
+                        render={
+                          <span
+                            aria-label={threadEnvironmentLabel ?? "Remote"}
+                            className={`inline-flex shrink-0 items-center justify-center ${
+                              isConfirmingArchive ? "invisible" : ""
+                            }`}
+                            data-legacy-sidebar-unscaled-content
+                          />
+                        }
+                      >
+                        <EnvironmentIcon
+                          kind={threadEnvironmentIconKind}
+                          context="legacy-row"
+                          color={environmentIconColor}
+                          className="size-3"
+                        />
+                      </TooltipTrigger>
+                      <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
+                    </Tooltip>
+                  ) : null}
+                </span>
+              </>
+            ) : null}
             {isConfirmingArchive ? (
               <button
                 ref={handleConfirmArchiveRef}

From 0c9b234ddaaf4ff672d9a2cfcdf7ba3459c7a85f Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Thu, 27 Aug 2026 02:31:05 -0700
Subject: [PATCH 5/6] fix(web): size jump hints to their labels

---
 apps/web/src/components/LegacySidebar.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 0abc0800da9a..0e320e617205 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -582,8 +582,11 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
       ? "transition-opacity duration-150 group-hover/menu-sub-item:opacity-0 group-focus-within/menu-sub-item:opacity-0"
       : "";
   const threadMetaClassName = `pointer-events-none inline-flex w-full justify-end ${
-    jumpLabel ? "col-span-3 col-start-1 row-start-1 z-10" : ""
+    jumpLabel ? "col-start-1 row-start-1 z-10" : ""
   } ${threadMetaVisibilityClassName}`;
+  const threadMetadataGridClassName = jumpLabel
+    ? "grid shrink-0 grid-cols-[max-content] items-center"
+    : "grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]";
   const [threadRowActive, setThreadRowActive] = useState(false);
   const clearConfirmingArchive = useCallback(() => {
     setConfirmingArchiveThreadKey((current) => (current === threadKey ? null : current));
@@ -981,11 +984,11 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
           {/* These fixed tracks are the scanning columns for every thread row.
               Empty local/worktree cells stay mounted for ordinary timestamps,
               which cannot widen the grid and push either icon sideways. A
-              transient jump hint replaces all three cells and tracks so a
-              custom shortcut cannot paint across visible metadata icons or
-              create an implicit grid row. */}
+              transient jump hint replaces all three cells and uses a
+              content-sized track so a custom shortcut cannot paint across
+              visible row content or create an implicit grid row. */}
           <div
-            className="grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]"
+            className={threadMetadataGridClassName}
             data-testid={`thread-metadata-grid-${thread.id}`}
           >
             {jumpLabel === null ? (

From 53c37c12e17e462bd81af696bdf7e4fa680ef5c2 Mon Sep 17 00:00:00 2001
From: Michael Johnston <lastobelus@mac.com>
Date: Thu, 27 Aug 2026 02:50:39 -0700
Subject: [PATCH 6/6] fix(web): reserve mobile jump actions

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

diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 0e320e617205..13dc5b7c1a7a 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -585,7 +585,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
     jumpLabel ? "col-start-1 row-start-1 z-10" : ""
   } ${threadMetaVisibilityClassName}`;
   const threadMetadataGridClassName = jumpLabel
-    ? "grid shrink-0 grid-cols-[max-content] items-center"
+    ? "grid shrink-0 grid-cols-[max-content] items-center max-sm:grid-cols-[max-content_calc(1.5rem*var(--legacy-sidebar-content-zoom))]"
     : "grid shrink-0 grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))] items-center gap-x-[calc(0.25rem*var(--legacy-sidebar-content-zoom))] max-sm:grid-cols-[repeat(2,calc(0.75rem*var(--legacy-sidebar-content-zoom)))_calc(3rem*var(--legacy-sidebar-content-zoom))_calc(1.5rem*var(--legacy-sidebar-content-zoom))]";
   const [threadRowActive, setThreadRowActive] = useState(false);
   const clearConfirmingArchive = useCallback(() => {
@@ -986,7 +986,8 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
               which cannot widen the grid and push either icon sideways. A
               transient jump hint replaces all three cells and uses a
               content-sized track so a custom shortcut cannot paint across
-              visible row content or create an implicit grid row. */}
+              visible row content or create an implicit grid row; the mobile
+              grid retains its trailing action track. */}
           <div
             className={threadMetadataGridClassName}
             data-testid={`thread-metadata-grid-${thread.id}`}