From ca6c218af4e39ea41ef17530e7aeeac34863eea6 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Tue, 1 Sep 2026 14:33:25 -0700
Subject: [PATCH 1/6] Align command palette controls and metadata

---
 .../commands/CommandPalette.test.tsx          |  9 ++++---
 .../src/components/commands/PaletteShell.tsx  | 24 ++++++++++---------
 .../commands/ThreadSearchPaletteMode.tsx      | 15 ++++++++----
 apps/app/src/components/ui/tab-pill.tsx       |  3 +++
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index deea6ea1bb..996a7c46ea 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -528,13 +528,14 @@ describe("CommandPalette", () => {
     const modeSelect = screen.getByRole("button", { name: "Threads search" });
     expectAttribute(modeSelect, "aria-pressed", "true");
     expect(modeSelect.querySelector('[data-icon="Search"]')).not.toBeNull();
+    expectClasses(modeSelect.parentElement, "border-border/70", "bg-background/70");
     expectAttribute(
       screen.getByRole("button", { name: "Return to commands" }),
       "data-tab-pill-close",
     );
-    expect(
-      screen.getByRole("button", { name: "Thread scope" }).textContent,
-    ).toContain("All");
+    const scope = screen.getByRole("button", { name: "Thread scope" });
+    expect(scope.textContent).toContain("All");
+    expectClasses(scope, "text-subtle-foreground", "opacity-70");
     expectText(screen.getByTestId("command-palette"), "Split");
     const footer = screen
       .getByTestId("command-palette")
@@ -855,6 +856,7 @@ describe("CommandPalette", () => {
       expectClasses(
         row.querySelector("[data-palette-thread-metadata]"),
         "text-subtle-foreground",
+        "opacity-70",
       );
     }
     expectClasses(
@@ -937,6 +939,7 @@ describe("CommandPalette", () => {
       expectClasses(
         row.querySelector("[data-palette-thread-metadata]"),
         "text-subtle-foreground",
+        "opacity-70",
       );
     }
     expect(results.querySelector("[data-palette-thread-state]")).toBeNull();
diff --git a/apps/app/src/components/commands/PaletteShell.tsx b/apps/app/src/components/commands/PaletteShell.tsx
index 89eeddadb7..73d6e25048 100644
--- a/apps/app/src/components/commands/PaletteShell.tsx
+++ b/apps/app/src/components/commands/PaletteShell.tsx
@@ -4,6 +4,11 @@ import { Icon } from "@bb/shared-ui/icon";
 import { useScrollOverflowState } from "@/components/thread/timeline/useScrollOverflowState";
 import { TabPill } from "@/components/ui/tab-pill";
 
+export const PALETTE_FOOTER_CONTROL_SURFACE_CLASS =
+  "border border-border/70 bg-background/70 shadow-xs";
+export const PALETTE_FOOTER_KEYCAP_CLASS = `inline-flex min-w-5 items-center justify-center rounded px-1.5 py-0.5 font-mono text-xs leading-none text-muted-foreground ${PALETTE_FOOTER_CONTROL_SURFACE_CLASS}`;
+export const PALETTE_FOOTER_LABEL_CLASS = "text-subtle-foreground opacity-70";
+
 interface PaletteModeChipProps {
   clearLabel: string;
   icon: Parameters<typeof Icon>[0]["name"];
@@ -67,9 +72,7 @@ export function PaletteShell({
           className="flex h-10 items-center gap-2 px-3"
           data-palette-input-frame
         >
-          {modeChip === undefined ? null : (
-            <PaletteModeChip {...modeChip} />
-          )}
+          {modeChip === undefined ? null : <PaletteModeChip {...modeChip} />}
           <input
             ref={inputRef}
             autoFocus
@@ -133,20 +136,18 @@ export function PaletteShell({
               {hint.keys.map((keys, index) => (
                 <span key={keys} className="inline-flex items-center gap-1">
                   {index === 0 ? null : (
-                    <span
-                      aria-hidden
-                      className="text-muted-foreground/60"
-                    >
+                    <span aria-hidden className="text-muted-foreground/60">
                       /
                     </span>
                   )}
-                  <kbd className="inline-flex min-w-5 items-center justify-center rounded border border-border/70 bg-background/70 px-1.5 py-0.5 font-mono text-xs leading-none text-muted-foreground shadow-xs">
-                    {keys}
-                  </kbd>
+                  <kbd className={PALETTE_FOOTER_KEYCAP_CLASS}>{keys}</kbd>
                 </span>
               ))}
             </span>
-            <span className="opacity-70" data-palette-footer-label>
+            <span
+              className={PALETTE_FOOTER_LABEL_CLASS}
+              data-palette-footer-label
+            >
               {hint.label}
             </span>
           </span>
@@ -169,6 +170,7 @@ function PaletteModeChip({
         label={label}
         title={label}
         isActive
+        className={PALETTE_FOOTER_CONTROL_SURFACE_CLASS}
         onSelect={() => undefined}
         leadingVisual={<Icon name={icon} aria-hidden />}
         closeAction={{ onClose: onClear, closeLabel: clearLabel }}
diff --git a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
index c567fa667f..ada14a68c4 100644
--- a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
+++ b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
@@ -35,7 +35,7 @@ import {
 } from "@/lib/command-palette/palette-thread-search";
 import { windowPaletteThreadSearchText } from "@/lib/command-palette/palette-thread-search-window";
 import type { PaletteModeViewProps } from "@/lib/command-palette/palette-mode";
-import { PaletteShell } from "./PaletteShell";
+import { PALETTE_FOOTER_LABEL_CLASS, PaletteShell } from "./PaletteShell";
 
 export function ThreadSearchPaletteMode({
   onExit,
@@ -253,8 +253,7 @@ export function ThreadSearchPaletteMode({
       ? "Searching threads"
       : trimmedQuery.length === 1
         ? "Type at least 2 characters"
-        : (navigation.isLoading || archivedThreads.isLoading) &&
-            result.isRecent
+        : (navigation.isLoading || archivedThreads.isLoading) && result.isRecent
           ? "Loading recent threads"
           : result.isRecent
             ? "No recent threads"
@@ -349,7 +348,10 @@ function ThreadSearchScopeFilter({
         aria-haspopup="listbox"
         aria-expanded={open}
         aria-label="Thread scope"
-        className="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs text-subtle-foreground outline-none hover:bg-state-hover hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
+        className={cn(
+          "inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs outline-none hover:bg-state-hover hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring",
+          PALETTE_FOOTER_LABEL_CLASS,
+        )}
         onClick={() => setOpen((value) => !value)}
         onKeyDown={(event) => {
           if (event.key === "ArrowDown" || event.key === "ArrowUp") {
@@ -478,7 +480,10 @@ function ThreadSearchPaletteRow({
           />
         </span>
         <span
-          className="block min-w-0 truncate text-xs leading-4 text-subtle-foreground"
+          className={cn(
+            "block min-w-0 truncate text-xs leading-4",
+            PALETTE_FOOTER_LABEL_CLASS,
+          )}
           title={row.metadataText}
           data-palette-thread-metadata
         >
diff --git a/apps/app/src/components/ui/tab-pill.tsx b/apps/app/src/components/ui/tab-pill.tsx
index 99ffdb98d5..7bdc0c4a94 100644
--- a/apps/app/src/components/ui/tab-pill.tsx
+++ b/apps/app/src/components/ui/tab-pill.tsx
@@ -23,6 +23,7 @@ interface TabPillCloseAction {
 
 interface TabPillProps {
   label: string;
+  className?: string;
   ariaLabel?: string;
   ariaKeyshortcuts?: string;
   iconOnly?: boolean;
@@ -39,6 +40,7 @@ interface TabPillProps {
 
 export function TabPill({
   label,
+  className,
   ariaLabel,
   ariaKeyshortcuts,
   iconOnly = false,
@@ -72,6 +74,7 @@ export function TabPill({
         isActive
           ? cn(CONTEXT_SELECTION_SURFACE_CLASS, "text-foreground")
           : "text-muted-foreground hover:bg-state-hover",
+        className,
       )}
     >
       <button

From 2d9560c674277ba51f7386f52903ecf32af7ddc7 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 3 Sep 2026 02:06:40 -0700
Subject: [PATCH 2/6] Restore command palette tab fill

---
 apps/app/src/components/commands/CommandPalette.test.tsx | 3 ++-
 apps/app/src/components/commands/PaletteShell.tsx        | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index 39dba05511..27e82d56ea 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -528,7 +528,8 @@ describe("CommandPalette", () => {
     const modeSelect = screen.getByRole("button", { name: "Threads search" });
     expectAttribute(modeSelect, "aria-pressed", "true");
     expect(modeSelect.querySelector('[data-icon="Search"]')).not.toBeNull();
-    expectClasses(modeSelect.parentElement, "border-border/70", "bg-background/70");
+    expectClasses(modeSelect.parentElement, "bg-state-active");
+    expectNoClasses(modeSelect.parentElement, "bg-background/70");
     expectAttribute(
       screen.getByRole("button", { name: "Return to commands" }),
       "data-tab-pill-close",
diff --git a/apps/app/src/components/commands/PaletteShell.tsx b/apps/app/src/components/commands/PaletteShell.tsx
index 73d6e25048..f0c1c66d69 100644
--- a/apps/app/src/components/commands/PaletteShell.tsx
+++ b/apps/app/src/components/commands/PaletteShell.tsx
@@ -170,7 +170,6 @@ function PaletteModeChip({
         label={label}
         title={label}
         isActive
-        className={PALETTE_FOOTER_CONTROL_SURFACE_CLASS}
         onSelect={() => undefined}
         leadingVisual={<Icon name={icon} aria-hidden />}
         closeAction={{ onClose: onClear, closeLabel: clearLabel }}

From 0c5674d9804beab8cbc6c208a640b6fd3bd59f33 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 3 Sep 2026 02:23:59 -0700
Subject: [PATCH 3/6] De-emphasize command palette shortcuts

---
 .../src/components/commands/CommandPalette.test.tsx   | 11 ++++++++++-
 apps/app/src/components/commands/PaletteShell.tsx     |  9 ++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index 27e82d56ea..bd2e8f31a3 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -551,7 +551,16 @@ describe("CommandPalette", () => {
     for (const keycap of footer?.querySelectorAll("kbd") ?? []) {
       expectClasses(
         keycap,
-        "rounded",
+        "rounded-sm",
+        "bg-state-hover",
+        "font-sans",
+        "font-normal",
+        "tabular-nums",
+        "text-subtle-foreground",
+        "opacity-60",
+      );
+      expectNoClasses(
+        keycap,
         "border-border/70",
         "bg-background/70",
         "font-mono",
diff --git a/apps/app/src/components/commands/PaletteShell.tsx b/apps/app/src/components/commands/PaletteShell.tsx
index f0c1c66d69..4d8437c965 100644
--- a/apps/app/src/components/commands/PaletteShell.tsx
+++ b/apps/app/src/components/commands/PaletteShell.tsx
@@ -1,12 +1,15 @@
 import type { KeyboardEventHandler, ReactNode, Ref } from "react";
 import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import { Icon } from "@bb/shared-ui/icon";
+import { cn } from "@bb/shared-ui/lib/utils";
 import { useScrollOverflowState } from "@/components/thread/timeline/useScrollOverflowState";
 import { TabPill } from "@/components/ui/tab-pill";
+import { APP_COMMAND_ACCESSORY_PILL_CLASS } from "./AppCommandShortcutHint";
 
-export const PALETTE_FOOTER_CONTROL_SURFACE_CLASS =
-  "border border-border/70 bg-background/70 shadow-xs";
-export const PALETTE_FOOTER_KEYCAP_CLASS = `inline-flex min-w-5 items-center justify-center rounded px-1.5 py-0.5 font-mono text-xs leading-none text-muted-foreground ${PALETTE_FOOTER_CONTROL_SURFACE_CLASS}`;
+export const PALETTE_FOOTER_KEYCAP_CLASS = cn(
+  APP_COMMAND_ACCESSORY_PILL_CLASS,
+  "min-w-5 py-0.5",
+);
 export const PALETTE_FOOTER_LABEL_CLASS = "text-subtle-foreground opacity-70";
 
 interface PaletteModeChipProps {

From a39d83dd7c4ea3ddcd51d9e5c45fc0dd8e725117 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 3 Sep 2026 03:05:14 -0700
Subject: [PATCH 4/6] Refine command palette guidance

---
 .../commands/CommandPalette.test.tsx          | 53 ++++++++++++++-----
 .../components/commands/CommandPalette.tsx    |  7 ++-
 .../src/components/commands/PaletteShell.tsx  | 15 +++++-
 .../commands/ThreadSearchPaletteMode.tsx      | 40 +++++---------
 .../src/lib/command-palette/palette-mode.ts   |  1 +
 .../src/lib/command-palette/palette-modes.ts  |  6 +--
 .../palette-thread-search.test.ts             | 31 +++++++++--
 .../command-palette/palette-thread-search.ts  | 19 ++++++-
 8 files changed, 120 insertions(+), 52 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index bd2e8f31a3..a1990f3a70 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -469,9 +469,16 @@ describe("CommandPalette", () => {
     const rootFooter = screen
       .getByTestId("command-palette")
       .querySelector("[data-palette-footer]");
-    expectText(rootFooter, "Select");
-    expectText(rootFooter, "Run");
-    expect(rootFooter?.textContent).not.toContain("Open");
+    expectText(rootFooter, "Close");
+    expect(rootFooter?.textContent).not.toContain("Select");
+    expect(rootFooter?.textContent).not.toContain("Run");
+    expectAttribute(rootFooter, "aria-hidden", "true");
+    const rootDescriptionId = searchField().getAttribute("aria-describedby");
+    expect(rootDescriptionId).not.toBeNull();
+    expectText(
+      document.getElementById(rootDescriptionId ?? ""),
+      "Use Escape to close the command palette.",
+    );
 
     const threadRows = within(bucketGroup("Threads")).getAllByRole("option");
     expect(threadRows.map((row) => row.textContent)).toEqual([
@@ -548,6 +555,7 @@ describe("CommandPalette", () => {
       "px-4",
       "py-2",
     );
+    expectAttribute(footer, "aria-hidden", "true");
     for (const keycap of footer?.querySelectorAll("kbd") ?? []) {
       expectClasses(
         keycap,
@@ -576,8 +584,19 @@ describe("CommandPalette", () => {
         "text-subtle-foreground",
       );
     }
-    expectText(footer, "Backspace");
+    expect(footer?.textContent).not.toContain("Backspace");
+    expect(footer?.textContent).not.toContain("Select");
+    expect(footer?.textContent).not.toContain("Open");
     expectText(footer, "Esc");
+    const threadInput = screen.getByRole("combobox", {
+      name: "Search threads",
+    });
+    const threadDescriptionId = threadInput.getAttribute("aria-describedby");
+    expect(threadDescriptionId).not.toBeNull();
+    expectText(
+      document.getElementById(threadDescriptionId ?? ""),
+      "Use Command-Enter or Control-Enter to open the selected thread in a split. Use Escape to return to commands.",
+    );
 
     fireEvent.keyDown(screen.getByRole("combobox"), { key: "Escape" });
     await waitFor(() =>
@@ -814,6 +833,12 @@ describe("CommandPalette", () => {
     expect(within(results).getByRole("option").textContent).toContain(
       "matching draft",
     );
+    expectText(
+      within(results)
+        .getByRole("option")
+        .querySelector("[data-palette-thread-metadata]"),
+      "Palette project · just now",
+    );
     fireEvent.keyDown(scope, { key: "Escape" });
     expect(document.activeElement).toBe(input);
 
@@ -869,14 +894,12 @@ describe("CommandPalette", () => {
         "opacity-70",
       );
     }
-    expectClasses(
-      within(rows[1] as HTMLElement).getByText("Draft"),
-      "text-subtle-foreground",
-    );
-    expectClasses(
-      within(rows[2] as HTMLElement).getByText("Archived"),
-      "text-subtle-foreground",
-    );
+    expect(
+      rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
+    ).toBe("Draft · Palette project · just now");
+    expect(
+      rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
+    ).toBe("Archived · Palette project · just now");
     expect(within(results).queryAllByRole("group")).toHaveLength(0);
     expect(within(results).queryByText("Recent")).toBeNull();
   });
@@ -952,6 +975,12 @@ describe("CommandPalette", () => {
         "opacity-70",
       );
     }
+    expect(
+      rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
+    ).toBe("Draft · Palette project · just now");
+    expect(
+      rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
+    ).toBe("Archived · Palette project · just now");
     expect(results.querySelector("[data-palette-thread-state]")).toBeNull();
     expect(within(results).queryAllByRole("group")).toHaveLength(0);
     expect(within(results).queryByText("Recent")).toBeNull();
diff --git a/apps/app/src/components/commands/CommandPalette.tsx b/apps/app/src/components/commands/CommandPalette.tsx
index b8ae2ed96a..e9c4f4efac 100644
--- a/apps/app/src/components/commands/CommandPalette.tsx
+++ b/apps/app/src/components/commands/CommandPalette.tsx
@@ -54,11 +54,9 @@ import {
 import { PaletteShell } from "./PaletteShell";
 
 const PALETTE_INPUT_LABEL = "Search commands";
+const PALETTE_INPUT_DESCRIPTION = "Use Escape to close the command palette.";
 const PALETTE_PLACEHOLDER = "Search commands…";
-const ROOT_FOOTER_KEYS = [
-  { keys: ["↑↓"], label: "Select" },
-  { keys: ["↵"], label: "Run" },
-] as const;
+const ROOT_FOOTER_KEYS = [{ keys: ["Esc"], label: "Close" }] as const;
 const MODE_ENTRY_HANDLER_PRIORITY = 100;
 const MODE_BY_ACTION_ID = new Map(
   PALETTE_MODES.map((mode) => [
@@ -359,6 +357,7 @@ export function CommandPalette({
                 : `${optionIdPrefix}-${activeIndex}`
             }
             footerKeys={ROOT_FOOTER_KEYS}
+            inputDescription={PALETTE_INPUT_DESCRIPTION}
             inputLabel={PALETTE_INPUT_LABEL}
             listId={listId}
             listLabel="Commands"
diff --git a/apps/app/src/components/commands/PaletteShell.tsx b/apps/app/src/components/commands/PaletteShell.tsx
index 4d8437c965..6e7959f69a 100644
--- a/apps/app/src/components/commands/PaletteShell.tsx
+++ b/apps/app/src/components/commands/PaletteShell.tsx
@@ -1,4 +1,9 @@
-import type { KeyboardEventHandler, ReactNode, Ref } from "react";
+import {
+  useId,
+  type KeyboardEventHandler,
+  type ReactNode,
+  type Ref,
+} from "react";
 import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import { Icon } from "@bb/shared-ui/icon";
 import { cn } from "@bb/shared-ui/lib/utils";
@@ -24,6 +29,7 @@ interface PaletteShellProps {
   accessory?: ReactNode;
   children: ReactNode;
   footerKeys: readonly { keys: readonly string[]; label: string }[];
+  inputDescription: string;
   inputLabel: string;
   inputRef?: Ref<HTMLInputElement>;
   listId: string;
@@ -41,6 +47,7 @@ export function PaletteShell({
   accessory,
   children,
   footerKeys,
+  inputDescription,
   inputLabel,
   inputRef,
   listId,
@@ -52,6 +59,7 @@ export function PaletteShell({
   placeholder,
   value,
 }: PaletteShellProps) {
+  const inputDescriptionId = useId();
   const overflow = useScrollOverflowState<HTMLDivElement>({
     measureOverflow: true,
   });
@@ -83,6 +91,7 @@ export function PaletteShell({
             aria-expanded
             aria-controls={listId}
             aria-activedescendant={activeDescendantId}
+            aria-describedby={inputDescriptionId}
             aria-label={inputLabel}
             autoComplete="off"
             spellCheck={false}
@@ -92,6 +101,9 @@ export function PaletteShell({
             onChange={(event) => onInputChange(event.target.value)}
             onKeyDown={onInputKeyDown}
           />
+          <span id={inputDescriptionId} className="sr-only">
+            {inputDescription}
+          </span>
           {accessory}
         </div>
       </div>
@@ -127,6 +139,7 @@ export function PaletteShell({
         </div>
       </div>
       <div
+        aria-hidden
         className="relative z-10 flex flex-wrap items-center gap-x-4 gap-y-1 border-t border-border bg-surface-recessed-soft-solid px-4 py-2 text-xs text-subtle-foreground"
         data-palette-footer
       >
diff --git a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
index ada14a68c4..8a1df0388f 100644
--- a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
+++ b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
@@ -12,7 +12,6 @@ import {
 import { useStore } from "jotai";
 import { useIsCompactViewport } from "@bb/shared-ui/hooks/use-compact-viewport";
 import { cn } from "@bb/shared-ui/lib/utils";
-import { COARSE_POINTER_TEXT_SM_CLASS } from "@bb/shared-ui/coarse-pointer-sizing";
 import { isPromptDraftEmpty } from "@bb/client-core";
 import type { ThreadSearchHighlightRange } from "@bb/server-contract";
 import { usePromptDraftStorage } from "@/hooks/usePromptDraftStorage";
@@ -275,6 +274,7 @@ export function ThreadSearchPaletteMode({
         />
       }
       footerKeys={presentation.footerKeys}
+      inputDescription={presentation.inputDescription}
       inputLabel="Search threads"
       inputRef={inputRef}
       listId={listId}
@@ -451,12 +451,6 @@ function ThreadSearchPaletteRow({
     }
   }, [matchKey, row.highlightRanges.length, shouldWindowMatch]);
 
-  const stateLabel =
-    row.lifecycle === "active"
-      ? null
-      : row.lifecycle === "draft"
-        ? "Draft"
-        : "Archived";
   return (
     <div
       id={id}
@@ -479,27 +473,19 @@ function ThreadSearchPaletteRow({
             ranges={primary.highlightRanges}
           />
         </span>
-        <span
-          className={cn(
-            "block min-w-0 truncate text-xs leading-4",
-            PALETTE_FOOTER_LABEL_CLASS,
-          )}
-          title={row.metadataText}
-          data-palette-thread-metadata
-        >
-          {row.metadataText}
-        </span>
+        {row.metadataText.length === 0 ? null : (
+          <span
+            className={cn(
+              "block min-w-0 truncate text-xs leading-4",
+              PALETTE_FOOTER_LABEL_CLASS,
+            )}
+            title={row.metadataText}
+            data-palette-thread-metadata
+          >
+            {row.metadataText}
+          </span>
+        )}
       </span>
-      {stateLabel === null ? null : (
-        <span
-          className={cn(
-            "shrink-0 text-xs text-subtle-foreground",
-            COARSE_POINTER_TEXT_SM_CLASS,
-          )}
-        >
-          {stateLabel}
-        </span>
-      )}
     </div>
   );
 }
diff --git a/apps/app/src/lib/command-palette/palette-mode.ts b/apps/app/src/lib/command-palette/palette-mode.ts
index 873a54d32e..d4b9973b9b 100644
--- a/apps/app/src/lib/command-palette/palette-mode.ts
+++ b/apps/app/src/lib/command-palette/palette-mode.ts
@@ -11,6 +11,7 @@ export interface PaletteModePresentation {
     keys: readonly string[];
     label: string;
   }[];
+  inputDescription: string;
   placeholder: string;
 }
 
diff --git a/apps/app/src/lib/command-palette/palette-modes.ts b/apps/app/src/lib/command-palette/palette-modes.ts
index b1d20b2330..1d83a263d4 100644
--- a/apps/app/src/lib/command-palette/palette-modes.ts
+++ b/apps/app/src/lib/command-palette/palette-modes.ts
@@ -8,11 +8,11 @@ export const PALETTE_MODES: readonly PaletteModeRegistration[] = [
     chip: { icon: "Search", label: "Threads" },
     placeholder: "Search title, project, or message…",
     footerKeys: [
-      { keys: ["↑↓"], label: "Select" },
-      { keys: ["↵"], label: "Open" },
       { keys: ["⌘↵"], label: "Split" },
-      { keys: ["Backspace", "Esc"], label: "Back" },
+      { keys: ["Esc"], label: "Back" },
     ],
+    inputDescription:
+      "Use Command-Enter or Control-Enter to open the selected thread in a split. Use Escape to return to commands.",
     View: ThreadSearchPaletteMode,
   },
 ];
diff --git a/apps/app/src/lib/command-palette/palette-thread-search.test.ts b/apps/app/src/lib/command-palette/palette-thread-search.test.ts
index ff7d5ba541..36b9b2cde4 100644
--- a/apps/app/src/lib/command-palette/palette-thread-search.test.ts
+++ b/apps/app/src/lib/command-palette/palette-thread-search.test.ts
@@ -108,16 +108,21 @@ describe("buildPaletteThreadSearchRows", () => {
       "draft",
       "archived",
     ]);
+    expect(result.rows.map((row) => row.metadataText)).toEqual([
+      "Palette project · just now",
+      "Draft · Palette project · just now",
+      "Archived · Palette project · just now",
+    ]);
     expect(result.draftMatchCount).toBe(1);
   });
 
-  it("narrows lifecycle immediately without changing row anatomy", () => {
-    const result = build({
+  it("omits redundant lifecycle metadata after narrowing scope", () => {
+    const draftResult = build({
       drafts: [makeDraft("draft", "A matching local draft")],
       scope: "draft",
     });
 
-    expect(result.rows).toMatchObject([
+    expect(draftResult.rows).toMatchObject([
       {
         lifecycle: "draft",
         metadataText: "Palette project · just now",
@@ -125,6 +130,26 @@ describe("buildPaletteThreadSearchRows", () => {
         draftSlotId: "draft",
       },
     ]);
+
+    const archived = makeThread("archived", { archivedAt: NOW - 1 });
+    const archivedResult = build({
+      scope: "archived",
+      searchResponse: {
+        active: { results: [], total: 0 },
+        archived: {
+          total: 1,
+          results: [{ thread: archived, matches: [] }],
+        },
+      },
+    });
+
+    expect(archivedResult.rows).toMatchObject([
+      {
+        lifecycle: "archived",
+        metadataText: "Palette project · just now",
+        threadId: "archived",
+      },
+    ]);
   });
 
   it("uses the matched message as primary while retaining title, project, and time metadata", () => {
diff --git a/apps/app/src/lib/command-palette/palette-thread-search.ts b/apps/app/src/lib/command-palette/palette-thread-search.ts
index c6473857a4..cec655eb2e 100644
--- a/apps/app/src/lib/command-palette/palette-thread-search.ts
+++ b/apps/app/src/lib/command-palette/palette-thread-search.ts
@@ -80,10 +80,19 @@ function metadataText(parts: readonly (string | null)[]): string {
   return parts.filter((part): part is string => Boolean(part)).join(" · ");
 }
 
+function lifecycleMetadata(
+  scope: PaletteThreadSearchScope,
+  lifecycle: PaletteThreadLifecycle,
+): string | null {
+  if (scope !== "all" || lifecycle === "active") return null;
+  return lifecycle === "draft" ? "Draft" : "Archived";
+}
+
 function serverRow(
   thread: ThreadListEntry,
   matches: readonly ThreadSearchMatch[],
   lifecycle: "active" | "archived",
+  scope: PaletteThreadSearchScope,
   projectNamesById: ReadonlyMap<string, string>,
   now: number,
 ): PaletteThreadSearchRow {
@@ -99,6 +108,7 @@ function serverRow(
     primaryText: primaryMatch?.text ?? title,
     highlightRanges: primaryMatch?.highlightRanges ?? [],
     metadataText: metadataText([
+      lifecycleMetadata(scope, lifecycle),
       snippetMatch === undefined ? null : title,
       projectMetadata(thread.projectId, projectNamesById),
       formatRelativeTime({ timestamp: thread.updatedAt, now }),
@@ -157,13 +167,16 @@ export function buildPaletteThreadSearchRows({
   const activeRows = isRecent
     ? recentThreads
         .slice(0, RECENT_THREAD_LIMIT)
-        .map((thread) => serverRow(thread, [], "active", projectNamesById, now))
+        .map((thread) =>
+          serverRow(thread, [], "active", scope, projectNamesById, now),
+        )
     : isSearchable && searchResultsAreCurrent
       ? (searchResponse?.active.results ?? []).map((result) =>
           serverRow(
             result.thread,
             result.matches,
             "active",
+            scope,
             projectNamesById,
             now,
           ),
@@ -185,6 +198,7 @@ export function buildPaletteThreadSearchRows({
     primaryText: item.title,
     highlightRanges: draftHighlightRanges(item.title, positions),
     metadataText: metadataText([
+      lifecycleMetadata(scope, "draft"),
       projectMetadata(item.destination.projectId, projectNamesById),
       item.lastEditedAt === null
         ? null
@@ -199,7 +213,7 @@ export function buildPaletteThreadSearchRows({
     ? recentArchivedThreads
         .slice(0, RECENT_THREAD_LIMIT)
         .map((thread) =>
-          serverRow(thread, [], "archived", projectNamesById, now),
+          serverRow(thread, [], "archived", scope, projectNamesById, now),
         )
     : isSearchable && searchResultsAreCurrent
       ? (searchResponse?.archived.results ?? []).map((result) =>
@@ -207,6 +221,7 @@ export function buildPaletteThreadSearchRows({
             result.thread,
             result.matches,
             "archived",
+            scope,
             projectNamesById,
             now,
           ),

From 898e7206af3ad874f6a69fd500ae5214258e421a Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 3 Sep 2026 03:26:16 -0700
Subject: [PATCH 5/6] Align palette metadata assertions

---
 apps/app/src/components/commands/CommandPalette.test.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index a1990f3a70..751a9b872a 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -837,7 +837,7 @@ describe("CommandPalette", () => {
       within(results)
         .getByRole("option")
         .querySelector("[data-palette-thread-metadata]"),
-      "Palette project · just now",
+      "Palette project",
     );
     fireEvent.keyDown(scope, { key: "Escape" });
     expect(document.activeElement).toBe(input);
@@ -896,7 +896,7 @@ describe("CommandPalette", () => {
     }
     expect(
       rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Draft · Palette project · just now");
+    ).toBe("Draft · Palette project");
     expect(
       rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
     ).toBe("Archived · Palette project · just now");
@@ -977,7 +977,7 @@ describe("CommandPalette", () => {
     }
     expect(
       rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Draft · Palette project · just now");
+    ).toBe("Draft · Palette project");
     expect(
       rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
     ).toBe("Archived · Palette project · just now");

From 3fb83cf3bbfcadd0944893dcd6bc187699d99aa1 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 3 Sep 2026 11:58:54 -0700
Subject: [PATCH 6/6] Restore trailing thread lifecycle labels

---
 .../components/commands/CommandPalette.test.tsx | 16 ++++++++++------
 .../commands/ThreadSearchPaletteMode.tsx        | 17 +++++++++++++++++
 .../palette-thread-search.test.ts               |  6 +++---
 .../command-palette/palette-thread-search.ts    | 17 ++---------------
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/apps/app/src/components/commands/CommandPalette.test.tsx b/apps/app/src/components/commands/CommandPalette.test.tsx
index 751a9b872a..1284b943d9 100644
--- a/apps/app/src/components/commands/CommandPalette.test.tsx
+++ b/apps/app/src/components/commands/CommandPalette.test.tsx
@@ -885,7 +885,6 @@ describe("CommandPalette", () => {
     expect(rows[1]?.textContent).toContain("Draft");
     expect(rows[2]?.textContent).toContain("Title recent-archived");
     expect(rows[2]?.textContent).toContain("Archived");
-    expect(results.querySelector("[data-palette-thread-state]")).toBeNull();
     expect(results.querySelector("[data-icon]")).toBeNull();
     for (const row of rows) {
       expectClasses(
@@ -896,10 +895,16 @@ describe("CommandPalette", () => {
     }
     expect(
       rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Draft · Palette project");
+    ).toBe("Palette project");
     expect(
       rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Archived · Palette project · just now");
+    ).toBe("Palette project · just now");
+    const draftState = rows[1]?.lastElementChild;
+    const archivedState = rows[2]?.lastElementChild;
+    expectText(draftState, "Draft");
+    expectText(archivedState, "Archived");
+    expectClasses(draftState, "shrink-0", "text-subtle-foreground");
+    expectClasses(archivedState, "shrink-0", "text-subtle-foreground");
     expect(within(results).queryAllByRole("group")).toHaveLength(0);
     expect(within(results).queryByText("Recent")).toBeNull();
   });
@@ -977,11 +982,10 @@ describe("CommandPalette", () => {
     }
     expect(
       rows[1]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Draft · Palette project");
+    ).toBe("Palette project");
     expect(
       rows[2]?.querySelector("[data-palette-thread-metadata]")?.textContent,
-    ).toBe("Archived · Palette project · just now");
-    expect(results.querySelector("[data-palette-thread-state]")).toBeNull();
+    ).toBe("Palette project · just now");
     expect(within(results).queryAllByRole("group")).toHaveLength(0);
     expect(within(results).queryByText("Recent")).toBeNull();
     expect(results.textContent).not.toContain("1/1");
diff --git a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
index 8a1df0388f..c4b6a59ace 100644
--- a/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
+++ b/apps/app/src/components/commands/ThreadSearchPaletteMode.tsx
@@ -12,6 +12,7 @@ import {
 import { useStore } from "jotai";
 import { useIsCompactViewport } from "@bb/shared-ui/hooks/use-compact-viewport";
 import { cn } from "@bb/shared-ui/lib/utils";
+import { COARSE_POINTER_TEXT_SM_CLASS } from "@bb/shared-ui/coarse-pointer-sizing";
 import { isPromptDraftEmpty } from "@bb/client-core";
 import type { ThreadSearchHighlightRange } from "@bb/server-contract";
 import { usePromptDraftStorage } from "@/hooks/usePromptDraftStorage";
@@ -451,6 +452,12 @@ function ThreadSearchPaletteRow({
     }
   }, [matchKey, row.highlightRanges.length, shouldWindowMatch]);
 
+  const stateLabel =
+    row.lifecycle === "active"
+      ? null
+      : row.lifecycle === "draft"
+        ? "Draft"
+        : "Archived";
   return (
     <div
       id={id}
@@ -486,6 +493,16 @@ function ThreadSearchPaletteRow({
           </span>
         )}
       </span>
+      {stateLabel === null ? null : (
+        <span
+          className={cn(
+            "shrink-0 text-xs text-subtle-foreground",
+            COARSE_POINTER_TEXT_SM_CLASS,
+          )}
+        >
+          {stateLabel}
+        </span>
+      )}
     </div>
   );
 }
diff --git a/apps/app/src/lib/command-palette/palette-thread-search.test.ts b/apps/app/src/lib/command-palette/palette-thread-search.test.ts
index 36b9b2cde4..df866af737 100644
--- a/apps/app/src/lib/command-palette/palette-thread-search.test.ts
+++ b/apps/app/src/lib/command-palette/palette-thread-search.test.ts
@@ -110,13 +110,13 @@ describe("buildPaletteThreadSearchRows", () => {
     ]);
     expect(result.rows.map((row) => row.metadataText)).toEqual([
       "Palette project · just now",
-      "Draft · Palette project · just now",
-      "Archived · Palette project · just now",
+      "Palette project · just now",
+      "Palette project · just now",
     ]);
     expect(result.draftMatchCount).toBe(1);
   });
 
-  it("omits redundant lifecycle metadata after narrowing scope", () => {
+  it("preserves metadata anatomy after narrowing lifecycle scope", () => {
     const draftResult = build({
       drafts: [makeDraft("draft", "A matching local draft")],
       scope: "draft",
diff --git a/apps/app/src/lib/command-palette/palette-thread-search.ts b/apps/app/src/lib/command-palette/palette-thread-search.ts
index cec655eb2e..9acaa92dae 100644
--- a/apps/app/src/lib/command-palette/palette-thread-search.ts
+++ b/apps/app/src/lib/command-palette/palette-thread-search.ts
@@ -80,19 +80,10 @@ function metadataText(parts: readonly (string | null)[]): string {
   return parts.filter((part): part is string => Boolean(part)).join(" · ");
 }
 
-function lifecycleMetadata(
-  scope: PaletteThreadSearchScope,
-  lifecycle: PaletteThreadLifecycle,
-): string | null {
-  if (scope !== "all" || lifecycle === "active") return null;
-  return lifecycle === "draft" ? "Draft" : "Archived";
-}
-
 function serverRow(
   thread: ThreadListEntry,
   matches: readonly ThreadSearchMatch[],
   lifecycle: "active" | "archived",
-  scope: PaletteThreadSearchScope,
   projectNamesById: ReadonlyMap<string, string>,
   now: number,
 ): PaletteThreadSearchRow {
@@ -108,7 +99,6 @@ function serverRow(
     primaryText: primaryMatch?.text ?? title,
     highlightRanges: primaryMatch?.highlightRanges ?? [],
     metadataText: metadataText([
-      lifecycleMetadata(scope, lifecycle),
       snippetMatch === undefined ? null : title,
       projectMetadata(thread.projectId, projectNamesById),
       formatRelativeTime({ timestamp: thread.updatedAt, now }),
@@ -168,7 +158,7 @@ export function buildPaletteThreadSearchRows({
     ? recentThreads
         .slice(0, RECENT_THREAD_LIMIT)
         .map((thread) =>
-          serverRow(thread, [], "active", scope, projectNamesById, now),
+          serverRow(thread, [], "active", projectNamesById, now),
         )
     : isSearchable && searchResultsAreCurrent
       ? (searchResponse?.active.results ?? []).map((result) =>
@@ -176,7 +166,6 @@ export function buildPaletteThreadSearchRows({
             result.thread,
             result.matches,
             "active",
-            scope,
             projectNamesById,
             now,
           ),
@@ -198,7 +187,6 @@ export function buildPaletteThreadSearchRows({
     primaryText: item.title,
     highlightRanges: draftHighlightRanges(item.title, positions),
     metadataText: metadataText([
-      lifecycleMetadata(scope, "draft"),
       projectMetadata(item.destination.projectId, projectNamesById),
       item.lastEditedAt === null
         ? null
@@ -213,7 +201,7 @@ export function buildPaletteThreadSearchRows({
     ? recentArchivedThreads
         .slice(0, RECENT_THREAD_LIMIT)
         .map((thread) =>
-          serverRow(thread, [], "archived", scope, projectNamesById, now),
+          serverRow(thread, [], "archived", projectNamesById, now),
         )
     : isSearchable && searchResultsAreCurrent
       ? (searchResponse?.archived.results ?? []).map((result) =>
@@ -221,7 +209,6 @@ export function buildPaletteThreadSearchRows({
             result.thread,
             result.matches,
             "archived",
-            scope,
             projectNamesById,
             now,
           ),