From c4e7220a2317eb29949c35be70877dc1df0d46de Mon Sep 17 00:00:00 2001
From: LHagfoss <lucash.1707@outlook.com>
Date: Sun, 15 Nov 2026 15:54:24 +0100
Subject: [PATCH] fix(desktop): lead the thread menu with what is used

The thread menu listed about fifteen actions with debugging tools (Repair Thread, Copy Thread ID, Open Thread Log) beside Pin and Rename. It now leads with Pin, Rename, Mark Unread and Snooze, then the thread's state and changes, and keeps the occasional tools under More. Copy Link takes the menu's Title Case and Mark Unread no longer shares Settle's icon.
---
 apps/desktop/src/ui/Sidebar.tsx | 135 ++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 57 deletions(-)

diff --git a/apps/desktop/src/ui/Sidebar.tsx b/apps/desktop/src/ui/Sidebar.tsx
index eb2b5b014..1ece71ae4 100644
--- a/apps/desktop/src/ui/Sidebar.tsx
+++ b/apps/desktop/src/ui/Sidebar.tsx
@@ -23,6 +23,7 @@ import {
   CircleAlert,
   CircleCheck,
   CircleDashed,
+  CircleDot,
   Clock,
   CloudUpload,
   Copy,
@@ -313,35 +314,27 @@ function ThreadMenuItems({
             onClear?.();
           }}
         >
-          <CircleCheck size={13} /> Mark {n} Unread
+          <CircleDot size={13} /> Mark {n} Unread
         </Item>
       </>
     );
   }
+  // Most used first (pin, rename, unread, snooze), then the thread's state and what it changed,
+  // then the worktree's own actions; the occasional tools sit under More, and Trash last.
   return (
     <>
-      {status !== "review" && (
-        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "review")}>
-          <Eye size={13} /> Mark for Review
-        </Item>
-      )}
-      {status === "done" ? (
-        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "idle")}>
-          <CircleDashed size={13} /> Unsettle
-        </Item>
-      ) : (
-        <Item className={menuItem} onSelect={() => settleThread(session.id)}>
-          <CircleCheck size={13} /> Settle
-        </Item>
-      )}
-      {status === "review" && (
-        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "idle")}>
-          <CircleDashed size={13} /> Clear Status
+      <Item className={menuItem} onSelect={() => togglePin(session.id)}>
+        {pinned ? <PinOff size={13} /> : <Pin size={13} />}
+        {pinned ? "Unpin" : "Pin"}
+      </Item>
+      {!remote && (
+        <Item className={menuItem} disabled={!canFiles} onSelect={onRename}>
+          <Pencil size={13} /> Rename…
         </Item>
       )}
-      {statusMissing && (
-        <div className="px-2 pb-1 text-caption text-fg-faint">Kept by the app: {statusMissing}</div>
-      )}
+      <Item className={menuItem} onSelect={() => markUnread(session.id)}>
+        <CircleDot size={13} /> Mark Unread
+      </Item>
       {snoozed ? (
         <Item className={menuItem} onSelect={() => snoozeThread(session.id, null)}>
           <Clock size={13} /> Unsnooze
@@ -375,49 +368,37 @@ function ThreadMenuItems({
           </Menu.Portal>
         </Menu.Sub>
       )}
-      {!remote && (
-        <Item className={menuItem} onSelect={() => setView({ kind: "review", threadId: session.id })}>
-          <FileDiff size={13} /> Review Changes
+      <Separator className={menuSeparator} />
+      {status === "done" ? (
+        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "idle")}>
+          <CircleDashed size={13} /> Unsettle
+        </Item>
+      ) : (
+        <Item className={menuItem} onSelect={() => settleThread(session.id)}>
+          <CircleCheck size={13} /> Settle
         </Item>
       )}
-      <Item className={menuItem} onSelect={() => setAutoCompactForThread(session.id, autoCompactOff)}>
-        <Sparkles size={13} /> {autoCompactOff ? "Turn On Auto-compact" : "Turn Off Auto-compact"}
-      </Item>
-      <Item className={menuItem} onSelect={() => markUnread(session.id)}>
-        <CircleCheck size={13} /> Mark Unread
-      </Item>
-      <Separator className={menuSeparator} />
-      <Item className={menuItem} onSelect={() => togglePin(session.id)}>
-        {pinned ? <PinOff size={13} /> : <Pin size={13} />}
-        {pinned ? "Unpin" : "Pin"}
-      </Item>
-      {!remote && (
-        <Item className={menuItem} disabled={!canFiles} onSelect={onRename}>
-          <Pencil size={13} /> Rename…
+      {status !== "review" && (
+        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "review")}>
+          <Eye size={13} /> Mark for Review
         </Item>
       )}
-      <Item className={menuItem} onSelect={() => void repairThread(session.id)}>
-        <Wrench size={13} /> Repair Thread
-      </Item>
-      <Item className={menuItem} onSelect={() => copyThreadLink(session.id)}>
-        <Copy size={13} /> Copy link
-      </Item>
-      <Item className={menuItem} onSelect={() => copyText(session.id, "Thread ID copied")}>
-        <Copy size={13} /> Copy Thread ID
-      </Item>
+      {status === "review" && (
+        <Item className={menuItem} onSelect={() => void setThreadStatus(session.id, "idle")}>
+          <CircleDashed size={13} /> Clear Status
+        </Item>
+      )}
+      {statusMissing && (
+        <div className="px-2 pb-1 text-caption text-fg-faint">Kept by the app: {statusMissing}</div>
+      )}
       {!remote && (
-        <Item
-          className={menuItem}
-          disabled={!canFiles}
-          onSelect={() =>
-            void openThreadLog(session.id).catch((e) =>
-              toast(`Could not open the thread log: ${errorText(e)}`, "error"),
-            )
-          }
-        >
-          <FileText size={13} /> Open Thread Log
+        <Item className={menuItem} onSelect={() => setView({ kind: "review", threadId: session.id })}>
+          <FileDiff size={13} /> Review Changes
         </Item>
       )}
+      <Item className={menuItem} onSelect={() => copyThreadLink(session.id)}>
+        <Copy size={13} /> Copy Link
+      </Item>
       {worktree && (
         <>
           <Separator className={menuSeparator} />
@@ -443,6 +424,46 @@ function ThreadMenuItems({
           )}
         </>
       )}
+      <Separator className={menuSeparator} />
+      {/* What a thread needs now and then, not every day: kept one level down so the menu leads
+          with what is used. */}
+      <Menu.Sub>
+        <Menu.SubTrigger className={menuItem}>
+          <Ellipsis size={13} /> More
+          <ChevronRight size={12} strokeWidth={2.5} className="ml-auto text-fg-faint" />
+        </Menu.SubTrigger>
+        <Menu.Portal>
+          <Menu.SubContent
+            sideOffset={4}
+            alignOffset={-5}
+            collisionPadding={surfaceCollisionPadding}
+            className={menuSurface}
+          >
+            <Item className={menuItem} onSelect={() => setAutoCompactForThread(session.id, autoCompactOff)}>
+              <Sparkles size={13} /> {autoCompactOff ? "Turn On Auto-compact" : "Turn Off Auto-compact"}
+            </Item>
+            <Item className={menuItem} onSelect={() => copyText(session.id, "Thread ID copied")}>
+              <Copy size={13} /> Copy Thread ID
+            </Item>
+            {!remote && (
+              <Item
+                className={menuItem}
+                disabled={!canFiles}
+                onSelect={() =>
+                  void openThreadLog(session.id).catch((e) =>
+                    toast(`Could not open the thread log: ${errorText(e)}`, "error"),
+                  )
+                }
+              >
+                <FileText size={13} /> Open Thread Log
+              </Item>
+            )}
+            <Item className={menuItem} onSelect={() => void repairThread(session.id)}>
+              <Wrench size={13} /> Repair Thread
+            </Item>
+          </Menu.SubContent>
+        </Menu.Portal>
+      </Menu.Sub>
       {!remote && (
         <>
           <Separator className={menuSeparator} />