From 0112f240634a3600ed5a64f018fae0e08271d501 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 18:27:01 -0700
Subject: [PATCH 01/54] Add folder-path helpers and sidebar grouping prefs (S1)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

First session of the Sidebar Nested Folders feature: the client-only
foundation that later sessions build on.

- folderPath.ts: pure parseThreadFolderPath / normalizeThreadTitle /
  titleCreatesFolder, plus buildFolderKey. "/" in a thread title is read
  as a folder separator; titles are split → trimmed → emptied → re-joined.
- folderPath.test.ts: covers every normalization rule and the
  titleCreatesFolder / buildFolderKey boundaries (18 cases).
- sidebarCollapsedAtoms.ts: three persisted prefs mirroring the existing
  atom pattern — sidebarGroupByAtom ("none"|"folder", default "none"),
  sidebarCollapsedFoldersAtom (string[]), folderOnboardingSeenAtom (bool).

No rendering, tree-building, or rename changes yet (later sessions).
Tests, typecheck, and lint pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/components/sidebar/folderPath.test.ts | 111 ++++++++++++++++++
 apps/app/src/components/sidebar/folderPath.ts |  65 ++++++++++
 .../sidebar/sidebarCollapsedAtoms.ts          |  33 ++++++
 3 files changed, 209 insertions(+)
 create mode 100644 apps/app/src/components/sidebar/folderPath.test.ts
 create mode 100644 apps/app/src/components/sidebar/folderPath.ts

diff --git a/apps/app/src/components/sidebar/folderPath.test.ts b/apps/app/src/components/sidebar/folderPath.test.ts
new file mode 100644
index 000000000..5943bf2c5
--- /dev/null
+++ b/apps/app/src/components/sidebar/folderPath.test.ts
@@ -0,0 +1,111 @@
+import { describe, expect, it } from "vitest";
+import {
+  buildFolderKey,
+  normalizeThreadTitle,
+  parseThreadFolderPath,
+  titleCreatesFolder,
+} from "./folderPath";
+
+describe("parseThreadFolderPath", () => {
+  it("splits on '/', trims segments, and drops empties", () => {
+    expect(parseThreadFolderPath("Work/Q3/Plan")).toEqual({
+      folders: ["Work", "Q3"],
+      leaf: "Plan",
+    });
+  });
+
+  it("treats a single segment as a leaf with no folder", () => {
+    expect(parseThreadFolderPath("Standalone")).toEqual({
+      folders: [],
+      leaf: "Standalone",
+    });
+  });
+
+  it("collapses leading, trailing, and doubled slashes", () => {
+    expect(parseThreadFolderPath("/Work//Q3/")).toEqual({
+      folders: ["Work"],
+      leaf: "Q3",
+    });
+  });
+
+  it("trims whitespace around each segment", () => {
+    expect(parseThreadFolderPath("Work / Q3 ")).toEqual({
+      folders: ["Work"],
+      leaf: "Q3",
+    });
+  });
+
+  it("yields an empty path for an all-slashes or empty title", () => {
+    expect(parseThreadFolderPath("///")).toEqual({ folders: [], leaf: "" });
+    expect(parseThreadFolderPath("")).toEqual({ folders: [], leaf: "" });
+  });
+});
+
+describe("normalizeThreadTitle", () => {
+  it("re-joins normalized segments with '/'", () => {
+    expect(normalizeThreadTitle("Work/Q3/Plan")).toBe("Work/Q3/Plan");
+  });
+
+  it("collapses leading, trailing, and doubled slashes", () => {
+    expect(normalizeThreadTitle("/Work//Q3/")).toBe("Work/Q3");
+  });
+
+  it("trims whitespace around each segment", () => {
+    expect(normalizeThreadTitle("Work / Q3 ")).toBe("Work/Q3");
+  });
+
+  it("leaves a single segment unchanged (after trimming)", () => {
+    expect(normalizeThreadTitle(" Standalone ")).toBe("Standalone");
+  });
+
+  it("normalizes an all-slashes or empty title to an empty string", () => {
+    expect(normalizeThreadTitle("///")).toBe("");
+    expect(normalizeThreadTitle("")).toBe("");
+  });
+
+  it("is idempotent on already-normalized titles", () => {
+    const normalized = normalizeThreadTitle("/Work//Q3/");
+    expect(normalizeThreadTitle(normalized)).toBe(normalized);
+  });
+});
+
+describe("titleCreatesFolder", () => {
+  it("is false for a single segment", () => {
+    expect(titleCreatesFolder("Standalone")).toBe(false);
+  });
+
+  it("is false when a trailing slash leaves a single segment", () => {
+    expect(titleCreatesFolder("Work/")).toBe(false);
+  });
+
+  it("is false for an all-slashes title", () => {
+    expect(titleCreatesFolder("///")).toBe(false);
+  });
+
+  it("is true once two or more segments survive normalization", () => {
+    expect(titleCreatesFolder("Work/Q3")).toBe(true);
+    expect(titleCreatesFolder("Work/Q3/")).toBe(true);
+    expect(titleCreatesFolder("Clients/Acme/Onboarding")).toBe(true);
+  });
+});
+
+describe("buildFolderKey", () => {
+  it("namespaces a folder path by its container id", () => {
+    expect(buildFolderKey("proj_bb", ["Work", "Q3"])).toBe(
+      "proj_bb::Work/Q3",
+    );
+  });
+
+  it("keeps same-named folders in different containers distinct", () => {
+    expect(buildFolderKey("proj_a", ["Work"])).not.toBe(
+      buildFolderKey("proj_b", ["Work"]),
+    );
+  });
+
+  it("uses the global sentinels for the non-project sections", () => {
+    expect(buildFolderKey("pinned", ["Work"])).toBe("pinned::Work");
+    expect(buildFolderKey("chronological", ["Work"])).toBe(
+      "chronological::Work",
+    );
+  });
+});
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
new file mode 100644
index 000000000..8d17eabe9
--- /dev/null
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -0,0 +1,65 @@
+// Pure helpers for the sidebar's derived folder layer. A thread title carries
+// its folder path inline: "/" is read as a separator, so "Work/Q3/Plan" is a
+// thread named "Plan" inside folders "Work" › "Q3". Nothing about folders is
+// stored — these functions are the single canonical home for parsing a title
+// into its folder ancestors + leaf, normalizing a title before it is written
+// back on rename, and detecting whether a title creates a folder.
+
+export interface ThreadFolderPath {
+  /** Folder ancestors, outermost first. Empty when the title has no folder. */
+  folders: string[];
+  /** The thread's own name — the last path segment (or the whole title). */
+  leaf: string;
+}
+
+// Split a title into its non-empty, trimmed segments. Collapses leading,
+// trailing, and doubled slashes and trims whitespace around each segment, so
+// "/Work//Q3/" and "Work / Q3 " both yield ["Work", "Q3"]. Shared by every
+// other helper here so parsing, normalizing, and detection stay consistent and
+// idempotent (re-running on already-normalized input is a no-op).
+function splitTitleSegments(title: string): string[] {
+  return title
+    .split("/")
+    .map((segment) => segment.trim())
+    .filter((segment) => segment.length > 0);
+}
+
+// Split a stored title into folder ancestors + leaf for rendering. A single
+// segment (or an all-slashes/empty title) has no folder. The leaf is always the
+// final segment; for an empty result the leaf is "".
+export function parseThreadFolderPath(title: string): ThreadFolderPath {
+  const segments = splitTitleSegments(title);
+  if (segments.length === 0) {
+    return { folders: [], leaf: "" };
+  }
+  return {
+    folders: segments.slice(0, -1),
+    leaf: segments[segments.length - 1],
+  };
+}
+
+// Canonical form written back on rename submit: split → trim → drop empties →
+// re-join with "/". "///" normalizes to "" (then blocked by empty-name
+// validation upstream); "Work / Q3 " normalizes to "Work/Q3".
+export function normalizeThreadTitle(title: string): string {
+  return splitTitleSegments(title).join("/");
+}
+
+// True when the normalized title yields at least one folder segment, i.e. two
+// or more segments survive normalization. "Work/Q3" → true; "Work", "Work/",
+// and "///" → false.
+export function titleCreatesFolder(title: string): boolean {
+  return parseThreadFolderPath(title).folders.length > 0;
+}
+
+// Stable identity for a folder within a section. `containerId` is the owner of
+// the section — a `proj_*` id for project sections, or a fixed sentinel for the
+// global sections — so "Work" in project A never collides with "Work" in
+// project B or in pinned. Renaming an ancestor segment changes the key, which
+// intentionally resets that folder's collapse state (it is a different folder).
+export function buildFolderKey(
+  containerId: string,
+  path: readonly string[],
+): string {
+  return `${containerId}::${path.join("/")}`;
+}
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index e17d16263..01637103d 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -8,6 +8,9 @@ const COLLAPSED_SIDEBAR_SECTIONS_STORAGE_KEY = "bb.sidebar.collapsedSections";
 const SIDEBAR_SECTION_ORDER_STORAGE_KEY = "bb.sidebar.sectionOrder";
 const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
+const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
+const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
+const FOLDER_ONBOARDING_SEEN_STORAGE_KEY = "bb.sidebar.folderOnboardingSeen";
 
 export type SidebarSectionId =
   | "pinned"
@@ -24,6 +27,10 @@ export type SidebarOrganizationMode = "project" | "chronological";
 // "updated" reuses the status-aware activity heuristic; "created" sorts by
 // the literal createdAt field.
 export type SidebarChronologicalSort = "updated" | "created";
+// Whether "/" in a thread title renders as nested folders. Orthogonal to the
+// organization mode and sort: "none" keeps today's flat behavior (literal
+// titles), "folder" buckets top-level threads into derived folders.
+export type SidebarGroupBy = "none" | "folder";
 
 export const DEFAULT_SIDEBAR_SECTION_ORDER: readonly SidebarSectionId[] = [
   "pinned",
@@ -83,3 +90,29 @@ export const sidebarChronologicalSortAtom =
     createJsonLocalStorage<SidebarChronologicalSort>(),
     { getOnInit: true },
   );
+
+// Opt-in folder grouping. Default "none" keeps the current sidebar layout.
+export const sidebarGroupByAtom = atomWithStorage<SidebarGroupBy>(
+  GROUP_BY_STORAGE_KEY,
+  "none",
+  createJsonLocalStorage<SidebarGroupBy>(),
+  { getOnInit: true },
+);
+
+// Collapsed folder keys (see buildFolderKey in folderPath.ts). A plain
+// string[], matching collapsedThreadIds / collapsedProjectIds.
+export const sidebarCollapsedFoldersAtom = atomWithStorage<string[]>(
+  COLLAPSED_FOLDERS_STORAGE_KEY,
+  [],
+  createJsonLocalStorage<string[]>(),
+  { getOnInit: true },
+);
+
+// Whether the first-folder onboarding modal has been accepted. Set on accept
+// (not on open), so a declined modal still teaches on a later attempt.
+export const folderOnboardingSeenAtom = atomWithStorage<boolean>(
+  FOLDER_ONBOARDING_SEEN_STORAGE_KEY,
+  false,
+  createJsonLocalStorage<boolean>(),
+  { getOnInit: true },
+);

From bd27c2ceba943908eb22693db69b8eab1d078f32 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 19:19:01 -0700
Subject: [PATCH 02/54] Render sidebar threads grouped into folders (S2+S3)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds the opt-in "Group by: Folder" sidebar mode: top-level threads fold
into nested, collapsible folders derived from "/" in their titles. Pure
derived rendering — no DB/API/daemon changes.

Assembly (S2):
- SidebarFolderGroup item variant + bucketIntoFolders helper, folding the
  top-level item list into a nested folder tree. Folders render as a block
  above loose threads; folders, contents, and nested subfolders are each
  ordered by the active comparator (folders by their representative
  descendant). One parentKey-aware orderSiblingItems seam so S5 manual sort
  can swap ordering per list without re-cutting the tree walk.
- buildProjectThreadGroups / buildChronologicalThreadList take folderOptions
  and early-return today's output untouched under Group by: None.
- buildPinnedSidebarState folds pinned roots into folders ordered by
  comparePinnedRoots (pinned keeps its pinSortKey ordering), exposing
  rootItems while keeping rootNodes.

Rendering (S3):
- SidebarFolderRow collapsible header (icon, leaf name, descendant count,
  rolled-up activity) mirroring the parent/worktree row chrome.
- ProjectRow renders folder items + recurses; ThreadRow gains
  displayTitle/accessibleTitle so a folder member shows its leaf while
  keeping the full "Work › Q3 › Planning" path for a11y + tooltip.
- Collapse state in sidebarCollapsedFoldersAtom (read where rendered);
  selected thread's folder ancestors auto-expand.
- SidebarViewOptionsMenu gains a Group by (None / Folder) section; the
  existing organization "Group by" is relabeled "Organize by" to avoid the
  label collision.
- PinnedThreadTree renders folders statically (drag-reorder and derived
  folders don't compose), keeping the sortable flat list when no folders.

Tests: bucketIntoFolders nesting, folders-first + representative-descendant
ordering under both comparators, child-stays-under-parent, env-group-in-
folder, pinned folder ordering, and the Group by: None regression (deep-
equal to the pre-change builder + folder branch never entered).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../components/sidebar/PinnedThreadTree.tsx   |  45 +++-
 .../src/components/sidebar/ProjectList.tsx    |  68 +++++-
 .../app/src/components/sidebar/ProjectRow.tsx | 201 +++++++++++++---
 .../components/sidebar/SidebarFolderRow.tsx   | 152 ++++++++++++
 apps/app/src/components/sidebar/ThreadRow.tsx |  19 +-
 apps/app/src/components/sidebar/folderPath.ts |   9 +
 .../sidebar/pinnedSidebarThreads.test.ts      |  40 ++++
 .../sidebar/pinnedSidebarThreads.ts           |  43 +++-
 .../sidebar/projectThreadGroups.test.ts       | 221 +++++++++++++++++-
 .../components/sidebar/projectThreadGroups.ts | 220 ++++++++++++++++-
 10 files changed, 960 insertions(+), 58 deletions(-)
 create mode 100644 apps/app/src/components/sidebar/SidebarFolderRow.tsx

diff --git a/apps/app/src/components/sidebar/PinnedThreadTree.tsx b/apps/app/src/components/sidebar/PinnedThreadTree.tsx
index bf9073261..c11eb1a27 100644
--- a/apps/app/src/components/sidebar/PinnedThreadTree.tsx
+++ b/apps/app/src/components/sidebar/PinnedThreadTree.tsx
@@ -5,10 +5,18 @@ import {
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import type { NeighborReorderRequest } from "@/lib/neighbor-reorder";
-import { ThreadTreeNodeRow } from "./ProjectRow";
+import {
+  getItemKey,
+  getItemProjectId,
+  ThreadTreeItemRow,
+  ThreadTreeNodeRow,
+} from "./ProjectRow";
 import { useSidebarSortable } from "./sortableMotion";
 import { useSidebarReorderDnd } from "./useSidebarReorderDnd";
-import type { ProjectThreadNode } from "./projectThreadGroups";
+import type {
+  ProjectThreadItem,
+  ProjectThreadNode,
+} from "./projectThreadGroups";
 import {
   useNeighborReorderSortable,
   type UseNeighborReorderSortableArgs,
@@ -20,6 +28,10 @@ export interface PinnedThreadRootReorderCallbacks {
 
 export interface PinnedThreadTreeProps {
   rootNodes: readonly ProjectThreadNode[];
+  // Folder-aware render list. When it contains folders (Group by: Folder), the
+  // pinned section renders them as a static tree; otherwise it keeps the
+  // existing sortable flat list (pinned reorder via pinSortKey).
+  rootItems: readonly ProjectThreadItem[];
   selectedThreadId?: string;
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
@@ -118,6 +130,7 @@ const SortablePinnedRootItem = memo(function SortablePinnedRootItem({
 
 export const PinnedThreadTree = memo(function PinnedThreadTree({
   rootNodes,
+  rootItems,
   selectedThreadId,
   collapsedThreadIds,
   collapsedEnvironmentIds,
@@ -127,6 +140,9 @@ export const PinnedThreadTree = memo(function PinnedThreadTree({
   isPinnedReorderPending = false,
   onReorderPinnedRoot,
 }: PinnedThreadTreeProps) {
+  // Drag-reorder (pinSortKey) and derived folders don't compose — a folder has
+  // no sort key — so when folders are actually present we render a static tree.
+  const hasFolders = rootItems.some((item) => item.kind === "folder");
   const handleReorderPinnedRoot = useCallback<
     UseNeighborReorderSortableArgs<ProjectThreadNode>["onReorder"]
   >(
@@ -150,6 +166,31 @@ export const PinnedThreadTree = memo(function PinnedThreadTree({
   const { dndContextProps, consumeClickSuppression, onClickCapture } =
     useSidebarReorderDnd({ onDragEnd: handleSortableDragEnd });
 
+  if (hasFolders) {
+    return (
+      <div
+        data-sidebar-sticky-section=""
+        className="relative space-y-0.5 group-data-[collapsible=icon]:hidden"
+      >
+        {rootItems.map((item) => (
+          <ThreadTreeItemRow
+            key={getItemKey(item)}
+            projectId={getItemProjectId(item)}
+            item={item}
+            depthOffset={0}
+            selectedThreadId={selectedThreadId}
+            collapsedThreadIds={collapsedThreadIds}
+            collapsedEnvironmentIds={collapsedEnvironmentIds}
+            variant="section"
+            onProjectSelect={onProjectSelect}
+            onToggleThreadCollapsed={onToggleThreadCollapsed}
+            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+          />
+        ))}
+      </div>
+    );
+  }
+
   if (renderedRootNodes.length === 0) {
     return null;
   }
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 2be8d2e2f..8134f50b8 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -11,7 +11,7 @@ import {
   type ReactNode,
 } from "react";
 import { useNavigate } from "react-router-dom";
-import { useAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 import { DndContext, type DragEndEvent } from "@dnd-kit/core";
 import {
   SortableContext,
@@ -89,12 +89,19 @@ import {
   collapsedSidebarSectionIdsAtom,
   DEFAULT_SIDEBAR_SECTION_ORDER,
   sidebarChronologicalSortAtom,
+  sidebarCollapsedFoldersAtom,
+  sidebarGroupByAtom,
   sidebarOrganizationModeAtom,
   sidebarSectionOrderAtom,
   type CollapsibleSidebarSectionId,
   type SidebarOrganizationMode,
   type SidebarSectionId,
 } from "./sidebarCollapsedAtoms";
+import { buildFolderKey, parseThreadFolderPath } from "./folderPath";
+import {
+  CHRONOLOGICAL_CONTAINER_ID,
+  PINNED_CONTAINER_ID,
+} from "./projectThreadGroups";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -503,6 +510,7 @@ function SidebarViewOptionsMenu({
   const [chronologicalSort, setChronologicalSort] = useAtom(
     sidebarChronologicalSortAtom,
   );
+  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -528,7 +536,7 @@ function SidebarViewOptionsMenu({
         mobileTitle="Sidebar display options"
       >
         <SidebarOrganizeMenuSectionLabel className="pt-1.5">
-          Group by
+          Organize by
         </SidebarOrganizeMenuSectionLabel>
         <SidebarOrganizeMenuOption
           label="Project"
@@ -568,6 +576,26 @@ function SidebarViewOptionsMenu({
             setChronologicalSort("created");
           }}
         />
+        <DropdownMenuSeparator />
+        <SidebarOrganizeMenuSectionLabel className="pt-2">
+          Group by
+        </SidebarOrganizeMenuSectionLabel>
+        <SidebarOrganizeMenuOption
+          label="None"
+          selected={groupBy === "none"}
+          onSelect={(event) => {
+            event.preventDefault();
+            setGroupBy("none");
+          }}
+        />
+        <SidebarOrganizeMenuOption
+          label="Folder"
+          selected={groupBy === "folder"}
+          onSelect={(event) => {
+            event.preventDefault();
+            setGroupBy("folder");
+          }}
+        />
       </DropdownMenuContent>
     </DropdownMenu>
   );
@@ -1162,6 +1190,8 @@ function ProjectListComponent({
   );
   const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
   const [chronologicalSort] = useAtom(sidebarChronologicalSortAtom);
+  const [groupBy] = useAtom(sidebarGroupByAtom);
+  const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
       chronologicalSort === "created"
@@ -1219,8 +1249,8 @@ function ProjectListComponent({
     setCollapsedSidebarSectionIdList,
   ]);
   const pinnedSidebarState = useMemo(
-    () => buildPinnedSidebarState({ threads }),
-    [threads],
+    () => buildPinnedSidebarState({ threads, groupBy }),
+    [threads, groupBy],
   );
   const hasPinnedSection = pinnedSidebarState.rootNodes.length > 0;
   const visibleSidebarSectionOrder = useMemo(
@@ -1274,6 +1304,32 @@ function ProjectListComponent({
       removeCollapsedIds(current, environmentIdsToExpand),
     );
 
+    // Under Group by: Folder, also un-collapse the selected thread's folder
+    // ancestors so it can't hide behind a collapsed folder. The folder key is
+    // scoped to whichever section renders the thread (pinned / chronological /
+    // its project), matching how the assembly sites namespace folder keys.
+    if (groupBy === "folder") {
+      const { folders } = parseThreadFolderPath(selectedThread.title ?? "");
+      if (folders.length > 0) {
+        const folderContainerId = pinnedSidebarState.effectivePinnedThreadIds.has(
+          selectedThreadId,
+        )
+          ? PINNED_CONTAINER_ID
+          : organizationMode === "chronological"
+            ? CHRONOLOGICAL_CONTAINER_ID
+            : selectedThread.projectId;
+        const folderKeysToExpand = new Set<string>();
+        for (let depth = 1; depth <= folders.length; depth += 1) {
+          folderKeysToExpand.add(
+            buildFolderKey(folderContainerId, folders.slice(0, depth)),
+          );
+        }
+        setCollapsedFolderList((current) =>
+          removeCollapsedIds(current, folderKeysToExpand),
+        );
+      }
+    }
+
     if (pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId)) {
       return;
     }
@@ -1292,9 +1348,12 @@ function ProjectListComponent({
       removeCollapsedIds(current, new Set(["projects"])),
     );
   }, [
+    groupBy,
+    organizationMode,
     pinnedSidebarState.effectivePinnedThreadIds,
     selectedThreadId,
     setCollapsedEnvironmentIdList,
+    setCollapsedFolderList,
     setCollapsedProjectIdList,
     setCollapsedSidebarSectionIdList,
     setCollapsedThreadIdList,
@@ -1469,6 +1528,7 @@ function ProjectListComponent({
   const pinnedSectionContent = (
     <PinnedThreadTree
       rootNodes={pinnedSidebarState.rootNodes}
+      rootItems={pinnedSidebarState.rootItems}
       selectedThreadId={selectedThreadId}
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index eeef9bec9..885414a29 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -7,6 +7,7 @@ import {
   type MouseEventHandler,
   type ReactNode,
 } from "react";
+import { useAtomValue, useSetAtom } from "jotai";
 import type { ThreadListEntry } from "@bb/domain";
 import type { ProjectResponse } from "@bb/server-contract";
 import { NavLink, useNavigate } from "react-router-dom";
@@ -67,11 +68,22 @@ import {
 import {
   buildChronologicalThreadList,
   buildProjectThreadGroups,
+  CHRONOLOGICAL_CONTAINER_ID,
   type EnvironmentThreadGroup,
   type ProjectThreadItem,
   type ProjectThreadNode,
+  type SidebarFolderGroup,
   type ThreadComparator,
 } from "./projectThreadGroups";
+import { SidebarFolderRow } from "./SidebarFolderRow";
+import {
+  formatFolderPathLabel,
+  parseThreadFolderPath,
+} from "./folderPath";
+import {
+  sidebarCollapsedFoldersAtom,
+  sidebarGroupByAtom,
+} from "./sidebarCollapsedAtoms";
 import {
   SIDEBAR_PROJECT_GROUP_LINE_CLASS,
   SIDEBAR_ROW_BASE_CLASS,
@@ -177,12 +189,29 @@ interface ThreadTreeNodeRowProps {
   dragBindings?: SidebarSortableDragBindings;
   sortableRef?: (element: HTMLDivElement | null) => void;
   sortableStyle?: CSSProperties;
+  // True when this row is a direct member of a folder: show the leaf, keep the
+  // full path for a11y. Its own child threads stay full-titled.
+  insideFolder?: boolean;
 }
 
 interface ThreadTreeItemRowProps {
   projectId: string;
   item: ProjectThreadItem;
   depthOffset: number;
+  // True for the direct members of a folder, so thread rows show the leaf.
+  insideFolder?: boolean;
+  selectedThreadId?: string;
+  collapsedThreadIds: Set<string>;
+  collapsedEnvironmentIds: Set<string>;
+  variant: ProjectThreadTreeVariant;
+  onProjectSelect?: () => void;
+  onToggleThreadCollapsed: (threadId: string) => void;
+  onToggleEnvironmentCollapsed: (environmentId: string) => void;
+}
+
+interface FolderTreeItemRowProps {
+  folder: SidebarFolderGroup;
+  depthOffset: number;
   selectedThreadId?: string;
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
@@ -192,6 +221,31 @@ interface ThreadTreeItemRowProps {
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
 }
 
+// Render key + routing projectId for any item kind. Folders derive from their
+// first nested item, so a folder spanning projects (chronological) still routes
+// each contained thread to its own project.
+export function getItemKey(item: ProjectThreadItem): string {
+  switch (item.kind) {
+    case "thread":
+      return `thread:${item.node.thread.id}`;
+    case "environment":
+      return `env:${item.group.environmentId}`;
+    case "folder":
+      return `folder:${item.group.key}`;
+  }
+}
+
+export function getItemProjectId(item: ProjectThreadItem): string {
+  switch (item.kind) {
+    case "thread":
+      return item.node.thread.projectId;
+    case "environment":
+      return item.group.nodes[0].thread.projectId;
+    case "folder":
+      return getItemProjectId(item.group.items[0]);
+  }
+}
+
 interface EnvironmentThreadGroupRowProps {
   projectId: string;
   environmentThreadGroup: EnvironmentThreadGroup;
@@ -877,10 +931,11 @@ const EnvironmentThreadGroupRow = memo(function EnvironmentThreadGroupRow({
   );
 });
 
-const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
+export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   projectId,
   item,
   depthOffset,
+  insideFolder = false,
   selectedThreadId,
   collapsedThreadIds,
   collapsedEnvironmentIds,
@@ -889,6 +944,22 @@ const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ThreadTreeItemRowProps) {
+  if (item.kind === "folder") {
+    return (
+      <FolderTreeItemRow
+        folder={item.group}
+        depthOffset={depthOffset}
+        selectedThreadId={selectedThreadId}
+        collapsedThreadIds={collapsedThreadIds}
+        collapsedEnvironmentIds={collapsedEnvironmentIds}
+        variant={variant}
+        onProjectSelect={onProjectSelect}
+        onToggleThreadCollapsed={onToggleThreadCollapsed}
+        onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+      />
+    );
+  }
+
   if (item.kind === "thread") {
     return (
       <ThreadTreeNodeRow
@@ -896,6 +967,7 @@ const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         node={item.node}
         depthOffset={depthOffset}
         isEnvGrouped={false}
+        insideFolder={insideFolder}
         selectedThreadId={selectedThreadId}
         collapsedThreadIds={collapsedThreadIds}
         collapsedEnvironmentIds={collapsedEnvironmentIds}
@@ -924,6 +996,74 @@ const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   );
 });
 
+// A derived folder and its (recursively rendered) contents. Collapse state lives
+// in sidebarCollapsedFoldersAtom — read here rather than threaded so the rest of
+// the tree's prop wiring and memo equality stay untouched. Children render one
+// depth deeper and, when threads, show their leaf via insideFolder.
+const FolderTreeItemRow = memo(function FolderTreeItemRow({
+  folder,
+  depthOffset,
+  selectedThreadId,
+  collapsedThreadIds,
+  collapsedEnvironmentIds,
+  variant,
+  onProjectSelect,
+  onToggleThreadCollapsed,
+  onToggleEnvironmentCollapsed,
+}: FolderTreeItemRowProps) {
+  const collapsedFolders = useAtomValue(sidebarCollapsedFoldersAtom);
+  const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
+  const folderKey = folder.key;
+  const isCollapsed = collapsedFolders.includes(folderKey);
+  const handleToggleCollapsed = useCallback(() => {
+    setCollapsedFolders((current) =>
+      current.includes(folderKey)
+        ? current.filter((key) => key !== folderKey)
+        : [...current, folderKey],
+    );
+  }, [folderKey, setCollapsedFolders]);
+
+  const headerDepth = getThreadRowDepth({ depthOffset, nodeDepth: 0, variant });
+  const stickyLevel =
+    depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
+
+  return (
+    <SidebarStickyGroup className="space-y-0.5">
+      <SidebarFolderRow
+        name={folder.name}
+        pathLabel={formatFolderPathLabel(folder.path)}
+        depth={headerDepth}
+        threadCount={folder.threadCount}
+        activity={folder.activity}
+        isCollapsed={isCollapsed}
+        onToggleCollapsed={handleToggleCollapsed}
+        stickyLevel={stickyLevel}
+      />
+      {!isCollapsed ? (
+        <div className="relative space-y-px">
+          <ThreadTreeGroupLine parentRowDepth={headerDepth} />
+          {folder.items.map((item) => (
+            <ThreadTreeItemRow
+              key={getItemKey(item)}
+              projectId={getItemProjectId(item)}
+              item={item}
+              depthOffset={depthOffset + 1}
+              insideFolder
+              selectedThreadId={selectedThreadId}
+              collapsedThreadIds={collapsedThreadIds}
+              collapsedEnvironmentIds={collapsedEnvironmentIds}
+              variant={variant}
+              onProjectSelect={onProjectSelect}
+              onToggleThreadCollapsed={onToggleThreadCollapsed}
+              onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+            />
+          ))}
+        </div>
+      ) : null}
+    </SidebarStickyGroup>
+  );
+});
+
 export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
   projectId,
   node,
@@ -940,6 +1080,7 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
   dragBindings,
   sortableRef,
   sortableStyle,
+  insideFolder = false,
 }: ThreadTreeNodeRowProps) {
   const isCollapsed = collapsedThreadIds.has(node.thread.id);
   const hasChildren = node.children.length > 0;
@@ -986,6 +1127,18 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
     projectId,
     threadId: node.thread.id,
   });
+  // Inside a folder the row shows its leaf but keeps the full path for a11y;
+  // outside a folder (or for this node's own children) it shows the full title.
+  const folderTitles = useMemo(() => {
+    if (!insideFolder) {
+      return undefined;
+    }
+    const { folders, leaf } = parseThreadFolderPath(node.thread.title ?? "");
+    return {
+      displayTitle: leaf || undefined,
+      accessibleTitle: formatFolderPathLabel([...folders, leaf]) || undefined,
+    };
+  }, [insideFolder, node.thread.title]);
   const row = (
     <ThreadRow
       projectId={projectId}
@@ -994,6 +1147,8 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
       hasComposerDraft={hasComposerDraft}
       onProjectSelect={onProjectSelect}
       options={options}
+      displayTitle={folderTitles?.displayTitle}
+      accessibleTitle={folderTitles?.accessibleTitle}
     />
   );
 
@@ -1013,11 +1168,7 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
           <ThreadTreeGroupLine parentRowDepth={parentRowDepth} />
           {node.children.map((item) => (
             <ThreadTreeItemRow
-              key={
-                item.kind === "thread"
-                  ? `thread:${item.node.thread.id}`
-                  : `env:${item.group.environmentId}`
-              }
+              key={getItemKey(item)}
               projectId={projectId}
               item={item}
               depthOffset={depthOffset}
@@ -1048,13 +1199,18 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ProjectThreadTreeProps) {
+  const groupBy = useAtomValue(sidebarGroupByAtom);
   const projectThreads =
     threadListState.status === "ready"
       ? threadListState.threads
       : EMPTY_PROJECT_THREADS;
   const rootItems = useMemo(
-    () => buildProjectThreadGroups(projectThreads, compareThreads),
-    [compareThreads, projectThreads],
+    () =>
+      buildProjectThreadGroups(projectThreads, compareThreads, {
+        groupBy,
+        containerId: projectId,
+      }),
+    [compareThreads, projectThreads, groupBy, projectId],
   );
 
   if (threadListState.status === "loading") {
@@ -1097,11 +1253,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
     <ProjectThreadTreeGroup variant={variant}>
       {rootItems.map((item) => (
         <ThreadTreeItemRow
-          key={
-            item.kind === "thread"
-              ? `thread:${item.node.thread.id}`
-              : `env:${item.group.environmentId}`
-          }
+          key={getItemKey(item)}
           projectId={projectId}
           item={item}
           depthOffset={0}
@@ -1118,12 +1270,6 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   );
 });
 
-function getChronologicalItemProjectId(item: ProjectThreadItem): string {
-  return item.kind === "thread"
-    ? item.node.thread.projectId
-    : item.group.nodes[0].thread.projectId;
-}
-
 // Flat "All Threads" bucket for chronological mode: one top-level row per
 // non-pinned thread across all projects, globally ordered by the chosen
 // comparator (no parent/child nesting or worktree grouping, so nothing hides
@@ -1139,13 +1285,18 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ChronologicalThreadTreeProps) {
+  const groupBy = useAtomValue(sidebarGroupByAtom);
   const threads =
     threadListState.status === "ready"
       ? threadListState.threads
       : EMPTY_PROJECT_THREADS;
   const rootItems = useMemo(
-    () => buildChronologicalThreadList(threads, compareThreads),
-    [threads, compareThreads],
+    () =>
+      buildChronologicalThreadList(threads, compareThreads, {
+        groupBy,
+        containerId: CHRONOLOGICAL_CONTAINER_ID,
+      }),
+    [threads, compareThreads, groupBy],
   );
 
   if (threadListState.status === "loading") {
@@ -1178,12 +1329,8 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
     <ProjectThreadTreeGroup variant="section">
       {rootItems.map((item) => (
         <ThreadTreeItemRow
-          key={
-            item.kind === "thread"
-              ? `thread:${item.node.thread.id}`
-              : `env:${item.group.environmentId}`
-          }
-          projectId={getChronologicalItemProjectId(item)}
+          key={getItemKey(item)}
+          projectId={getItemProjectId(item)}
           item={item}
           depthOffset={0}
           selectedThreadId={selectedThreadId}
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
new file mode 100644
index 000000000..cd2db655d
--- /dev/null
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -0,0 +1,152 @@
+import { memo, type CSSProperties } from "react";
+import { Icon } from "@/components/ui/icon.js";
+import { SidebarStickyTier } from "@/components/ui/sidebar.js";
+import {
+  COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
+  COARSE_POINTER_GLYPH_BOX_CLASS,
+  COARSE_POINTER_ICON_SIZE_CLASS,
+  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+} from "@/components/ui/coarse-pointer-sizing.js";
+import {
+  SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
+  SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
+} from "@/components/ui/sidebar-hover-actions.js";
+import { cn } from "@/lib/utils";
+import type { CollapsedChildActivity } from "@/lib/thread-activity";
+import {
+  SIDEBAR_ROW_BASE_CLASS,
+  SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
+  getSidebarThreadRowPaddingLeft,
+} from "./sidebarRowClasses";
+import { SidebarChildToggleChevron } from "./SidebarChildToggleChevron";
+import { ThreadStatusGlyph } from "./ThreadRow";
+
+interface SidebarFolderRowProps {
+  // Leaf segment shown on the header ("Q3").
+  name: string;
+  // Full normalized path for the tooltip + accessible name ("Work › Q3"), so
+  // two same-named folders in different branches stay distinguishable.
+  pathLabel: string;
+  // Render depth (folder nesting + section offset); drives indentation.
+  depth: number;
+  threadCount: number;
+  activity: CollapsedChildActivity;
+  isCollapsed: boolean;
+  onToggleCollapsed: () => void;
+  // Pin depth among parent rows when sticky; absent = not pinned (past the cap).
+  stickyLevel?: number;
+}
+
+// The "Work › Q3 (2)" disclosure header for a derived folder. Not a thread:
+// clicking toggles collapse, there is no navigation. Mirrors the parent-thread
+// and worktree-header chrome (leading icon, truncating name, chevron, and a
+// rolled-up activity glyph while collapsed).
+function SidebarFolderRowComponent({
+  name,
+  pathLabel,
+  depth,
+  threadCount,
+  activity,
+  isCollapsed,
+  onToggleCollapsed,
+  stickyLevel,
+}: SidebarFolderRowProps) {
+  // Collapsed: the header speaks for its hidden descendants through one glyph
+  // (pending > working > unread). Expanded: descendants show their own glyphs.
+  const showRollupGlyph =
+    isCollapsed && (activity.pending || activity.working || activity.unread);
+  const className = cn(
+    SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
+    // Only the non-sticky header needs `relative`; a sticky tier is already a
+    // positioned box. Mirrors ThreadRow / EnvironmentThreadGroupHeader.
+    stickyLevel === undefined && "relative",
+    SIDEBAR_ROW_BASE_CLASS,
+    SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
+    COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
+    "cursor-pointer",
+  );
+  const style: CSSProperties = {
+    paddingLeft: getSidebarThreadRowPaddingLeft(depth),
+  };
+  const content = (
+    <>
+      {/* Full-bleed toggle target for pointer users; the chevron owns keyboard
+          focus (mirrors the project row's hidden focus button). */}
+      <button
+        type="button"
+        aria-hidden="true"
+        tabIndex={-1}
+        onClick={onToggleCollapsed}
+        className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
+      />
+      <span
+        className={cn(
+          "pointer-events-none relative z-10 inline-flex shrink-0 items-center justify-center text-subtle-foreground",
+          COARSE_POINTER_GLYPH_BOX_CLASS,
+        )}
+        aria-hidden="true"
+      >
+        <Icon
+          name={isCollapsed ? "Folder" : "FolderOpen"}
+          className={COARSE_POINTER_ICON_SIZE_CLASS}
+          aria-hidden="true"
+        />
+      </span>
+      <span className="relative z-10 flex min-w-0 flex-1 items-center gap-1.5 text-left">
+        <span className="min-w-0 truncate font-medium">{name}</span>
+        <span className="shrink-0 text-xs tabular-nums text-subtle-foreground/70">
+          {threadCount}
+        </span>
+        <SidebarChildToggleChevron
+          isCollapsed={isCollapsed}
+          expandLabel={`Expand ${pathLabel} folder`}
+          collapseLabel={`Collapse ${pathLabel} folder`}
+          expandTitle="Expand folder"
+          collapseTitle="Collapse folder"
+          onToggle={onToggleCollapsed}
+        />
+      </span>
+      <span
+        className={cn("relative z-10 shrink-0", COARSE_POINTER_ROW_ACTION_SIZE_CLASS)}
+      >
+        {showRollupGlyph ? (
+          <span
+            className={cn(
+              SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
+              "pointer-events-none absolute inset-0 flex items-center justify-center text-subtle-foreground",
+            )}
+          >
+            <ThreadStatusGlyph
+              hasPendingInteraction={activity.pending}
+              isBusy={activity.working}
+              showUnreadBadge={activity.unread}
+              unreadBadgeTone={activity.unreadError ? "error" : "default"}
+            />
+          </span>
+        ) : null}
+      </span>
+    </>
+  );
+
+  if (stickyLevel !== undefined) {
+    return (
+      <SidebarStickyTier
+        tier="parent"
+        level={stickyLevel}
+        className={className}
+        style={style}
+        title={pathLabel}
+      >
+        {content}
+      </SidebarStickyTier>
+    );
+  }
+
+  return (
+    <div className={className} style={style} title={pathLabel}>
+      {content}
+    </div>
+  );
+}
+
+export const SidebarFolderRow = memo(SidebarFolderRowComponent);
diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index 4f52e270f..1c3beb1d6 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -80,6 +80,14 @@ interface ThreadRowProps {
   hasComposerDraft: boolean;
   onProjectSelect?: () => void;
   options: ThreadRowOptions;
+  // Visible row text. Inside a folder this is the leaf ("Planning"); otherwise
+  // it is the full title (default). The folder path is hidden visually but kept
+  // in `accessibleTitle`.
+  displayTitle?: string;
+  // Accessible name + hover tooltip. Inside a folder this is the full path
+  // ("Work › Q3 › Planning") so two same-leaf threads stay distinguishable;
+  // otherwise it defaults to the full title.
+  accessibleTitle?: string;
 }
 
 type ThreadRowClickCaptureHandler = MouseEventHandler<HTMLDivElement>;
@@ -239,6 +247,8 @@ function ThreadRowComponent({
   hasComposerDraft,
   onProjectSelect,
   options,
+  displayTitle,
+  accessibleTitle,
 }: ThreadRowProps) {
   const [isDropdownActionsOpen, setIsDropdownActionsOpen] = useState(false);
   const [isContextActionsOpen, setIsContextActionsOpen] = useState(false);
@@ -252,6 +262,9 @@ function ThreadRowComponent({
   const unreadBadgeTone: SidebarUnreadDotTone =
     showUnreadBadge && thread.status === "error" ? "error" : "default";
   const threadTitle = getThreadDisplayTitle(thread);
+  // Inside a folder the row shows the leaf but keeps the full path for a11y.
+  const visibleTitle = displayTitle ?? threadTitle;
+  const labelTitle = accessibleTitle ?? threadTitle;
   const parentOptions = options.kind === "parent" ? options : null;
   const isParentRow = parentOptions !== null;
   const isParentCollapsed = parentOptions?.isCollapsed ?? false;
@@ -275,8 +288,8 @@ function ThreadRowComponent({
   const trailingUnreadBadgeTone: SidebarUnreadDotTone =
     hasHiddenChildren && childActivity.unreadError ? "error" : unreadBadgeTone;
   const linkLabel = hasComposerDraft
-    ? `Open ${threadTitle} (unsubmitted draft)`
-    : `Open ${threadTitle}`;
+    ? `Open ${labelTitle} (unsubmitted draft)`
+    : `Open ${labelTitle}`;
   const linkTitle = linkLabel;
   const parentDragBindings = parentOptions?.dragBindings;
   const rowClassName = cn(
@@ -320,7 +333,7 @@ function ThreadRowComponent({
         className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
       />
       <span className="flex min-w-0 flex-1 items-center gap-1.5">
-        <span className="min-w-0 truncate">{threadTitle}</span>
+        <span className="min-w-0 truncate">{visibleTitle}</span>
         {parentOptions && hasChildren ? (
           <SidebarChildToggleChevron
             isCollapsed={isParentCollapsed}
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
index 8d17eabe9..d4fa340a6 100644
--- a/apps/app/src/components/sidebar/folderPath.ts
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -52,6 +52,15 @@ export function titleCreatesFolder(title: string): boolean {
   return parseThreadFolderPath(title).folders.length > 0;
 }
 
+// Human-readable folder path, used for tooltips, accessible names, and the
+// rename preview ("Work › Q3 › Planning"). The visible separator differs from
+// the stored "/" so a path reads as breadcrumbs, not a literal title.
+export const FOLDER_PATH_SEPARATOR = " › ";
+
+export function formatFolderPathLabel(segments: readonly string[]): string {
+  return segments.join(FOLDER_PATH_SEPARATOR);
+}
+
 // Stable identity for a folder within a section. `containerId` is the owner of
 // the section — a `proj_*` id for project sections, or a fixed sentinel for the
 // global sections — so "Work" in project A never collides with "Work" in
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
index 97d9fcc77..c28099934 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
@@ -183,4 +183,44 @@ describe("buildPinnedSidebarState", () => {
     });
     expect(state.rootNodes[0]?.stats.childCount).toBe(1);
   });
+
+  it("folds pinned roots into folders ordered by the pinned comparator", () => {
+    const state = buildPinnedSidebarState({
+      threads: [
+        // FolderA's pinned thread sorts after FolderB's by pinSortKey, so
+        // FolderB's folder must render first under the pinned (not sidebar)
+        // ordering.
+        createThread({
+          id: "a",
+          title: "Work/Alpha",
+          pinnedAt: 1_000,
+          pinSortKey: "b",
+        }),
+        createThread({
+          id: "b",
+          title: "Personal/Beta",
+          pinnedAt: 1_000,
+          pinSortKey: "a",
+        }),
+      ],
+      groupBy: "folder",
+    });
+
+    expect(
+      state.rootItems.map((item) =>
+        item.kind === "folder" ? item.group.key : "thread",
+      ),
+    ).toEqual(["pinned::Personal", "pinned::Work"]);
+  });
+
+  it("keeps a flat thread list under Group by: None", () => {
+    const state = buildPinnedSidebarState({
+      threads: [
+        createThread({ id: "a", title: "Work/Alpha", pinnedAt: 1_000, pinSortKey: "a" }),
+      ],
+      groupBy: "none",
+    });
+
+    expect(state.rootItems.every((item) => item.kind === "thread")).toBe(true);
+  });
 });
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
index 241a7468a..0831599ae 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
@@ -1,18 +1,25 @@
 import type { ThreadListEntry } from "@bb/domain";
 import { compareCodepoint } from "@/lib/codepoint-compare";
 import {
+  bucketIntoFolders,
   buildProjectThreadGroups,
+  PINNED_CONTAINER_ID,
   type ProjectThreadItem,
   type ProjectThreadNode,
 } from "./projectThreadGroups";
+import type { SidebarGroupBy } from "./sidebarCollapsedAtoms";
 
 export interface PinnedSidebarState {
   effectivePinnedThreadIds: Set<string>;
   rootNodes: ProjectThreadNode[];
+  // Folder-aware render list: flat thread items under Group by: None, folded
+  // into folders (ordered by comparePinnedRoots) under Group by: Folder.
+  rootItems: ProjectThreadItem[];
 }
 
 interface BuildPinnedSidebarStateArgs {
   threads: readonly ThreadListEntry[];
+  groupBy?: SidebarGroupBy;
 }
 
 function compareByPinnedFallback(
@@ -76,13 +83,23 @@ interface AddDescendantThreadIdsArgs {
 function collectRootNodes(
   items: readonly ProjectThreadItem[],
 ): ProjectThreadNode[] {
-  return items.flatMap((item) =>
-    item.kind === "thread" ? [item.node] : item.group.nodes,
-  );
+  return items.flatMap((item) => {
+    switch (item.kind) {
+      case "thread":
+        return [item.node];
+      case "environment":
+        return item.group.nodes;
+      case "folder":
+        // Pinned flattens before folding, so folders never reach here; recurse
+        // to keep the function total.
+        return collectRootNodes(item.group.items);
+    }
+  });
 }
 
 export function buildPinnedSidebarState({
   threads,
+  groupBy,
 }: BuildPinnedSidebarStateArgs): PinnedSidebarState {
   const explicitlyPinnedThreads = threads.filter(
     (thread) => thread.pinnedAt !== null,
@@ -115,12 +132,28 @@ export function buildPinnedSidebarState({
   const effectivePinnedThreads = threads.filter((thread) =>
     effectivePinnedThreadIds.has(thread.id),
   );
-  const rootItems = buildProjectThreadGroups(effectivePinnedThreads);
-  const rootNodes = collectRootNodes(rootItems);
+  const projectItems = buildProjectThreadGroups(effectivePinnedThreads);
+  const rootNodes = collectRootNodes(projectItems);
   rootNodes.sort((left, right) => comparePinnedRoots(left.thread, right.thread));
 
+  // Pinned has its own root order (pinSortKey via comparePinnedRoots), never the
+  // sidebar sort. Fold into folders using that same comparator so folders order
+  // by their representative pinned descendant; Group by: None keeps the flat list.
+  const sortedThreadItems = rootNodes.map(
+    (node): ProjectThreadItem => ({ kind: "thread", node }),
+  );
+  const rootItems =
+    groupBy === "folder"
+      ? bucketIntoFolders(
+          sortedThreadItems,
+          PINNED_CONTAINER_ID,
+          (left, right) => comparePinnedRoots(left, right),
+        )
+      : sortedThreadItems;
+
   return {
     effectivePinnedThreadIds,
     rootNodes,
+    rootItems,
   };
 }
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
index 3cfb4a9cc..8189eba50 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.test.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -1,9 +1,11 @@
 import type { ThreadListEntry } from "@bb/domain";
 import { describe, expect, it } from "vitest";
 import {
+  bucketIntoFolders,
   buildChronologicalThreadList,
   buildProjectThreadGroups,
   compareByCreatedAtDescending,
+  compareStandardThreads,
   type ProjectThreadItem,
   type ProjectThreadNode,
 } from "./projectThreadGroups";
@@ -12,7 +14,8 @@ type ThreadListEntryOverrides = Partial<ThreadListEntry>;
 type TreeSummary =
   | string
   | { id: string; children: TreeSummary[] }
-  | { env: string; threads: TreeSummary[] };
+  | { env: string; threads: TreeSummary[] }
+  | { folder: string; items: TreeSummary[] };
 
 function createThread(
   overrides: ThreadListEntryOverrides = {},
@@ -62,14 +65,22 @@ function summarizeNode(node: ProjectThreadNode): TreeSummary {
 }
 
 function summarizeItems(items: readonly ProjectThreadItem[]): TreeSummary[] {
-  return items.map((item) =>
-    item.kind === "thread"
-      ? summarizeNode(item.node)
-      : {
+  return items.map((item) => {
+    switch (item.kind) {
+      case "thread":
+        return summarizeNode(item.node);
+      case "environment":
+        return {
           env: item.group.environmentId,
           threads: item.group.nodes.map(summarizeNode),
-        },
-  );
+        };
+      case "folder":
+        return {
+          folder: item.group.key,
+          items: summarizeItems(item.group.items),
+        };
+    }
+  });
 }
 
 function findNode(
@@ -77,6 +88,13 @@ function findNode(
   threadId: string,
 ): ProjectThreadNode | null {
   for (const item of items) {
+    if (item.kind === "folder") {
+      const folderNode = findNode(item.group.items, threadId);
+      if (folderNode) {
+        return folderNode;
+      }
+      continue;
+    }
     const nodes = item.kind === "thread" ? [item.node] : item.group.nodes;
     for (const node of nodes) {
       if (node.thread.id === threadId) {
@@ -440,3 +458,192 @@ describe("buildProjectThreadGroups", () => {
     ]);
   });
 });
+
+const FOLDER_OPTIONS = { groupBy: "folder", containerId: "proj_1" } as const;
+
+describe("folder bucketing (Group by: Folder)", () => {
+  it("nests threads into folders derived from their titles, folders above loose threads", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({ id: "a", title: "Work/Q3/Plan" }),
+        createThread({ id: "b", title: "Work/Q3/Notes" }),
+        createThread({ id: "c", title: "Work/Q4" }),
+        createThread({ id: "d", title: "Standalone" }),
+      ],
+      compareStandardThreads,
+      FOLDER_OPTIONS,
+    );
+
+    // Same idle/attention threads tie-break on codepoint id; folders render as a
+    // block above the loose "Standalone" thread.
+    expect(summarizeItems(items)).toEqual([
+      {
+        folder: "proj_1::Work",
+        items: [
+          { folder: "proj_1::Work/Q3", items: ["a", "b"] },
+          "c",
+        ],
+      },
+      "d",
+    ]);
+  });
+
+  it("keeps a folder thread's own children nested under it and ignores their slashes", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({ id: "parent", title: "Work/Project" }),
+        createThread({
+          id: "child",
+          parentThreadId: "parent",
+          title: "Ignored/Child/Path",
+        }),
+      ],
+      compareStandardThreads,
+      FOLDER_OPTIONS,
+    );
+
+    // Only the top-level "parent" forms a folder; the child stays nested under
+    // it and its own "/" does not create a folder.
+    expect(summarizeItems(items)).toEqual([
+      {
+        folder: "proj_1::Work",
+        items: [{ id: "parent", children: ["child"] }],
+      },
+    ]);
+  });
+
+  it("places a worktree environment group inside a folder by its representative", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({
+          id: "w1",
+          title: "Work/Alpha",
+          environmentId: "env_shared",
+          environmentWorkspaceDisplayKind: "managed-worktree",
+        }),
+        createThread({
+          id: "w2",
+          title: "Work/Beta",
+          environmentId: "env_shared",
+          environmentWorkspaceDisplayKind: "managed-worktree",
+        }),
+      ],
+      compareStandardThreads,
+      FOLDER_OPTIONS,
+    );
+
+    expect(summarizeItems(items)).toEqual([
+      {
+        folder: "proj_1::Work",
+        items: [{ env: "env_shared", threads: ["w1", "w2"] }],
+      },
+    ]);
+  });
+
+  it("orders folders by their representative descendant under both comparators", () => {
+    const threads = [
+      createThread({
+        id: "old-active",
+        title: "FolderA/x",
+        status: "active",
+        createdAt: 10,
+        latestAttentionAt: 5,
+        runtime: { displayStatus: "active", hostReconnectGraceExpiresAt: null },
+      }),
+      createThread({
+        id: "new-idle",
+        title: "FolderB/y",
+        status: "idle",
+        createdAt: 50,
+        latestAttentionAt: 5,
+      }),
+    ];
+
+    // Standard comparator pins the active folder's representative first.
+    expect(
+      summarizeItems(
+        buildProjectThreadGroups(threads, compareStandardThreads, FOLDER_OPTIONS),
+      ),
+    ).toEqual([
+      { folder: "proj_1::FolderA", items: ["old-active"] },
+      { folder: "proj_1::FolderB", items: ["new-idle"] },
+    ]);
+
+    // Created comparator ignores status and ranks the newer createdAt first.
+    expect(
+      summarizeItems(
+        buildProjectThreadGroups(
+          threads,
+          compareByCreatedAtDescending,
+          FOLDER_OPTIONS,
+        ),
+      ),
+    ).toEqual([
+      { folder: "proj_1::FolderB", items: ["new-idle"] },
+      { folder: "proj_1::FolderA", items: ["old-active"] },
+    ]);
+  });
+
+  it("rolls descendant count + activity up onto the folder group", () => {
+    const items = bucketIntoFolders(
+      buildProjectThreadGroups([
+        createThread({ id: "busy", title: "Work/Busy", hasPendingInteraction: true }),
+        createThread({ id: "quiet", title: "Work/Quiet" }),
+      ]),
+      "proj_1",
+      compareStandardThreads,
+    );
+
+    expect(items).toHaveLength(1);
+    const folder = items[0];
+    if (folder.kind !== "folder") {
+      throw new Error("expected a folder item");
+    }
+    expect(folder.group.threadCount).toBe(2);
+    expect(folder.group.activity.pending).toBe(true);
+  });
+
+  it("folds the chronological list into folders too", () => {
+    const items = buildChronologicalThreadList(
+      [
+        createThread({ id: "a", title: "Work/One", createdAt: 20 }),
+        createThread({ id: "b", title: "Personal/Two", createdAt: 10 }),
+      ],
+      compareByCreatedAtDescending,
+      { groupBy: "folder", containerId: "chronological" },
+    );
+
+    expect(summarizeItems(items)).toEqual([
+      { folder: "chronological::Work", items: ["a"] },
+      { folder: "chronological::Personal", items: ["b"] },
+    ]);
+  });
+
+  describe("regression: Group by: None is unchanged", () => {
+    const slashFixture = [
+      createThread({ id: "a", title: "Work/Q3/Plan", createdAt: 30 }),
+      createThread({ id: "b", title: "Work/Notes", createdAt: 20 }),
+      createThread({ id: "c", title: "Standalone", createdAt: 10 }),
+    ];
+
+    it("returns output deep-equal to the pre-change builder for '/'-titled threads", () => {
+      const baseline = buildProjectThreadGroups(slashFixture);
+      const withNone = buildProjectThreadGroups(
+        slashFixture,
+        compareStandardThreads,
+        { groupBy: "none", containerId: "proj_1" },
+      );
+      expect(withNone).toEqual(baseline);
+    });
+
+    it("never enters the folder branch (no folder items even with slashes)", () => {
+      const withNone = buildProjectThreadGroups(
+        slashFixture,
+        compareStandardThreads,
+        { groupBy: "none", containerId: "proj_1" },
+      );
+      expect(withNone.some((item) => item.kind === "folder")).toBe(false);
+      expect(summarizeItems(withNone)).toEqual(["a", "b", "c"]);
+    });
+  });
+});
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.ts b/apps/app/src/components/sidebar/projectThreadGroups.ts
index a5d874373..703b52f1e 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.ts
@@ -7,6 +7,8 @@ import {
   getCollapsedChildActivity,
   type CollapsedChildActivity,
 } from "@/lib/thread-activity";
+import { buildFolderKey, parseThreadFolderPath } from "./folderPath";
+import type { SidebarGroupBy } from "./sidebarCollapsedAtoms";
 
 export interface ProjectThreadNodeStats {
   childCount: number;
@@ -32,12 +34,43 @@ export interface EnvironmentThreadGroup {
   stats: ProjectThreadNodeStats;
 }
 
+// A derived folder node (Group by: Folder). Folders are a pure rendering layer
+// folded out of "/"-separated thread titles by bucketIntoFolders — never stored.
+// A folder holds further items (threads, env groups, and nested folders) and
+// rolls up its descendants' count + activity so a collapsed header can speak for
+// them, mirroring a collapsed parent thread.
+export interface SidebarFolderGroup {
+  key: string; // `${containerId}::Work/Q3` — unique per project/section
+  name: string; // leaf segment shown on the header ("Q3")
+  path: string[]; // ["Work","Q3"]
+  depth: number; // folder nesting depth (0 = first level), drives indentation
+  items: ProjectThreadItem[];
+  threadCount: number; // total descendant threads
+  activity: CollapsedChildActivity; // rolled-up unread/working/pending
+}
+
 // A single render slot in a thread sibling list. Threads and env groups
 // interleave by recency, so renderers iterate one ordered list rather than two
-// parallel arrays.
+// parallel arrays. Folders join the same list only under Group by: Folder.
 export type ProjectThreadItem =
   | { kind: "thread"; node: ProjectThreadNode }
-  | { kind: "environment"; group: EnvironmentThreadGroup };
+  | { kind: "environment"; group: EnvironmentThreadGroup }
+  | { kind: "folder"; group: SidebarFolderGroup };
+
+// Opt-in folder grouping, threaded into the three assembly sites. `containerId`
+// scopes folder identity to its section (a `proj_*` id, or the sentinels
+// below). When groupBy is "none" each site early-returns its current output
+// untouched — no folder logic runs.
+export interface SidebarFolderOptions {
+  groupBy: SidebarGroupBy;
+  containerId: string;
+}
+
+// Container-id sentinels for the global (non-project) sections; project
+// sections use their own `proj_*` id. These namespace folder keys and manual
+// order so "Work" in one section never collides with "Work" in another.
+export const CHRONOLOGICAL_CONTAINER_ID = "chronological";
+export const PINNED_CONTAINER_ID = "pinned";
 
 // Orders sibling threads. The default keeps active rows pinned to createdAt and
 // inactive rows on attention recency; chronological mode can swap in a literal
@@ -121,7 +154,16 @@ export function compareStandardThreads(
 }
 
 function representativeThread(item: ProjectThreadItem): ThreadListEntry {
-  return item.kind === "thread" ? item.node.thread : item.group.nodes[0].thread;
+  switch (item.kind) {
+    case "thread":
+      return item.node.thread;
+    case "environment":
+      return item.group.nodes[0].thread;
+    case "folder":
+      // Folders never reach this pre-bucket comparator path; fall back to the
+      // first nested item's representative so the function stays total.
+      return representativeThread(item.group.items[0]);
+  }
 }
 
 function compareProjectThreadItems(
@@ -144,11 +186,16 @@ function getNodeAndDescendantThreads(
 function getItemThreadDescendants(
   items: readonly ProjectThreadItem[],
 ): ThreadListEntry[] {
-  return items.flatMap((item) =>
-    item.kind === "thread"
-      ? getNodeAndDescendantThreads(item.node)
-      : item.group.nodes.flatMap(getNodeAndDescendantThreads),
-  );
+  return items.flatMap((item) => {
+    switch (item.kind) {
+      case "thread":
+        return getNodeAndDescendantThreads(item.node);
+      case "environment":
+        return item.group.nodes.flatMap(getNodeAndDescendantThreads);
+      case "folder":
+        return getItemThreadDescendants(item.group.items);
+    }
+  });
 }
 
 function buildStatsForHiddenThreads(
@@ -249,6 +296,7 @@ function isRootThread(
 export function buildProjectThreadGroups(
   allProjectThreads: readonly ThreadListEntry[],
   compareThreads: ThreadComparator = compareStandardThreads,
+  folderOptions?: SidebarFolderOptions,
 ): ProjectThreadItem[] {
   const projectThreads = allProjectThreads.filter(isSidebarProjectThread);
   const projectThreadIds = new Set(projectThreads.map((thread) => thread.id));
@@ -302,7 +350,12 @@ export function buildProjectThreadGroups(
     );
   }
 
-  return buildSortedItems(rootNodes, compareThreads);
+  const rootItems = buildSortedItems(rootNodes, compareThreads);
+  // Group by: None — return today's output untouched, no folder logic.
+  if (folderOptions?.groupBy !== "folder") {
+    return rootItems;
+  }
+  return bucketIntoFolders(rootItems, folderOptions.containerId, compareThreads);
 }
 
 // Flat ordering for the chronological "All Threads" bucket: one top-level row
@@ -314,8 +367,9 @@ export function buildProjectThreadGroups(
 export function buildChronologicalThreadList(
   allThreads: readonly ThreadListEntry[],
   compareThreads: ThreadComparator = compareStandardThreads,
+  folderOptions?: SidebarFolderOptions,
 ): ProjectThreadItem[] {
-  return allThreads
+  const items = allThreads
     .filter(isSidebarProjectThread)
     .sort(compareThreads)
     .map(
@@ -329,6 +383,11 @@ export function buildChronologicalThreadList(
         },
       }),
     );
+  // Group by: None — flat globally-sorted list, no folder logic.
+  if (folderOptions?.groupBy !== "folder") {
+    return items;
+  }
+  return bucketIntoFolders(items, folderOptions.containerId, compareThreads);
 }
 
 export function isSidebarProjectThread(
@@ -388,3 +447,144 @@ function hasAtLeastTwoThreadNodes(
 ): nodes is EnvironmentThreadGroupNodes {
   return nodes.length >= 2;
 }
+
+// ---------------------------------------------------------------------------
+// Folder bucketing (Group by: Folder)
+//
+// A pure, opt-in layer that folds an already-built top-level item list into a
+// nested folder tree derived from each top-level thread's "/"-separated title.
+// Only top-level items form folders; a thread's own children and env groups
+// keep nesting under its leaf exactly as today (a child's "/" is ignored). The
+// active comparator still drives order — folders render as a block above loose
+// items, and folders, their contents, and the loose block are each sorted
+// recursively by the same comparator (folders by their representative
+// descendant — the descendant that sorts first).
+// ---------------------------------------------------------------------------
+
+interface FolderBucket {
+  subfolders: Map<string, FolderBucket>;
+  items: ProjectThreadItem[];
+}
+
+function createFolderBucket(): FolderBucket {
+  return { subfolders: new Map(), items: [] };
+}
+
+// The thread that orders an item among its siblings, and whose title decides
+// its folder path: a thread/env item keeps today's representative; a folder
+// uses the descendant thread that sorts first under the active comparator.
+function getItemOrderingThread(
+  item: ProjectThreadItem,
+  compareThreads: ThreadComparator,
+): ThreadListEntry {
+  switch (item.kind) {
+    case "thread":
+      return item.node.thread;
+    case "environment":
+      return item.group.nodes[0].thread;
+    case "folder":
+      return getItemThreadDescendants(item.group.items).reduce((first, thread) =>
+        compareThreads(thread, first) < 0 ? thread : first,
+      );
+  }
+}
+
+// The one sibling-ordering hook. Today it orders folders-first, each block by
+// the active comparator (ties already handled inside the comparator's codepoint
+// fallback). `parentKey` is unused here but is the seam Sort: None (manual
+// order) swaps to a stored per-parent order; threading it now keeps that change
+// from re-cutting the tree walk.
+function orderSiblingItems(
+  items: readonly ProjectThreadItem[],
+  // Seam for Sort: None — manual order will key off this parent. Unused today.
+  _parentKey: string,
+  compareThreads: ThreadComparator,
+): ProjectThreadItem[] {
+  const decorated = items.map((item) => ({
+    item,
+    isFolder: item.kind === "folder",
+    orderingThread: getItemOrderingThread(item, compareThreads),
+  }));
+  decorated.sort((left, right) => {
+    if (left.isFolder !== right.isFolder) {
+      return left.isFolder ? -1 : 1;
+    }
+    return compareThreads(left.orderingThread, right.orderingThread);
+  });
+  return decorated.map((entry) => entry.item);
+}
+
+function buildFolderGroup(
+  containerId: string,
+  path: string[],
+  items: ProjectThreadItem[],
+): SidebarFolderGroup {
+  const descendantThreads = getItemThreadDescendants(items);
+  return {
+    key: buildFolderKey(containerId, path),
+    name: path[path.length - 1],
+    path,
+    depth: path.length - 1,
+    items,
+    threadCount: descendantThreads.length,
+    activity: getCollapsedChildActivity(descendantThreads),
+  };
+}
+
+function buildFolderLevelItems(
+  bucket: FolderBucket,
+  containerId: string,
+  parentPath: readonly string[],
+  compareThreads: ThreadComparator,
+): ProjectThreadItem[] {
+  const folderItems: ProjectThreadItem[] = [];
+  for (const [name, subBucket] of bucket.subfolders) {
+    const path = [...parentPath, name];
+    const childItems = buildFolderLevelItems(
+      subBucket,
+      containerId,
+      path,
+      compareThreads,
+    );
+    folderItems.push({
+      kind: "folder",
+      group: buildFolderGroup(containerId, path, childItems),
+    });
+  }
+  const parentKey =
+    parentPath.length === 0
+      ? containerId
+      : buildFolderKey(containerId, parentPath);
+  return orderSiblingItems(
+    [...folderItems, ...bucket.items],
+    parentKey,
+    compareThreads,
+  );
+}
+
+// Fold a top-level item list into a nested folder tree. Items whose
+// representative thread's title has no folder segment stay loose at the top
+// level; the rest nest into the deepest folder of their path. No empty folders:
+// a folder node exists only because >=1 item resolved into it.
+export function bucketIntoFolders(
+  items: readonly ProjectThreadItem[],
+  containerId: string,
+  compareThreads: ThreadComparator = compareStandardThreads,
+): ProjectThreadItem[] {
+  const root = createFolderBucket();
+  for (const item of items) {
+    const orderingThread = getItemOrderingThread(item, compareThreads);
+    const { folders } = parseThreadFolderPath(orderingThread.title ?? "");
+    let bucket = root;
+    for (const segment of folders) {
+      let next = bucket.subfolders.get(segment);
+      if (!next) {
+        next = createFolderBucket();
+        bucket.subfolders.set(segment, next);
+      }
+      bucket = next;
+    }
+    bucket.items.push(item);
+  }
+  return buildFolderLevelItems(root, containerId, [], compareThreads);
+}

From 2cedbb309c62223f088eaf692f27c2c1d335a96c Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 20:49:32 -0700
Subject: [PATCH 03/54] Add folder rename onboarding flow (S4)

---
 .../dialogs/FolderOnboardingDialog.tsx        | 110 +++++++++++++
 .../dialogs/ThreadRenameDialog.stories.tsx    | 111 +++++--------
 .../components/dialogs/ThreadRenameDialog.tsx |  95 ++++++-----
 .../src/components/sidebar/ProjectList.tsx    |  41 ++---
 .../src/components/sidebar/folderPath.test.ts |  27 ++++
 apps/app/src/components/sidebar/folderPath.ts |  16 ++
 .../thread/ThreadActionsProvider.tsx          | 147 ++++++++++++++++--
 7 files changed, 409 insertions(+), 138 deletions(-)
 create mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.tsx

diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
new file mode 100644
index 000000000..1df41f0d4
--- /dev/null
+++ b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
@@ -0,0 +1,110 @@
+import { Button } from "@/components/ui/button.js";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.js";
+
+interface FolderOnboardingDialogContentProps {
+  // The user's entry previewed as breadcrumbs ("Work › Q3 › Planning").
+  pathLabel: string;
+  // Only shown when grouping is currently off, since accepting turns it on.
+  showGroupingHint: boolean;
+  pending: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+/**
+ * Body of the first-folder confirmation: explains that "/" files a thread into
+ * a folder, previews the resulting path, and offers Create / Cancel. Split from
+ * the modal shell so stories can render it without the overlay (mirrors
+ * {@link ConfirmDeleteDialogContent}).
+ */
+export function FolderOnboardingDialogContent({
+  pathLabel,
+  showGroupingHint,
+  pending,
+  onConfirm,
+  onCancel,
+}: FolderOnboardingDialogContentProps) {
+  return (
+    <>
+      <DialogHeader>
+        <DialogTitle>Organize threads into folders</DialogTitle>
+        <DialogDescription>
+          Using “/” groups this thread into a folder:
+        </DialogDescription>
+      </DialogHeader>
+      <div className="space-y-2 text-sm">
+        <div className="rounded-md bg-muted px-3 py-2 font-medium break-words">
+          {pathLabel}
+        </div>
+        {showGroupingHint ? (
+          <p className="text-muted-foreground">
+            Folder grouping will turn on so you can see it.
+          </p>
+        ) : null}
+      </div>
+      <DialogFooter>
+        <Button
+          type="button"
+          variant="outline"
+          disabled={pending}
+          onClick={onCancel}
+        >
+          Cancel
+        </Button>
+        <Button type="button" disabled={pending} onClick={onConfirm}>
+          Create folder
+        </Button>
+      </DialogFooter>
+    </>
+  );
+}
+
+interface FolderOnboardingDialogProps {
+  open: boolean;
+  pathLabel: string;
+  showGroupingHint: boolean;
+  pending: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+  // Esc / overlay dismiss routes back through cancel (reopen rename).
+  onOpenChange: (open: boolean) => void;
+}
+
+/**
+ * First-folder confirmation modal, shown the first time a rename would create a
+ * folder. Accepting submits the rename and enables folder grouping; declining
+ * (button, Esc, or overlay) hands control back to the rename dialog with the
+ * draft intact.
+ */
+export function FolderOnboardingDialog({
+  open,
+  pathLabel,
+  showGroupingHint,
+  pending,
+  onConfirm,
+  onCancel,
+  onOpenChange,
+}: FolderOnboardingDialogProps) {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        {open ? (
+          <FolderOnboardingDialogContent
+            pathLabel={pathLabel}
+            showGroupingHint={showGroupingHint}
+            pending={pending}
+            onConfirm={onConfirm}
+            onCancel={onCancel}
+          />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
index 558998bb4..95c81a703 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
@@ -1,8 +1,5 @@
 import { useRef } from "react";
-import {
-  ThreadRenameDialogContent,
-  type ThreadRenameDialogTarget,
-} from "./ThreadRenameDialog";
+import { ThreadRenameDialogContent } from "./ThreadRenameDialog";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import { DialogStage } from "../../../.ladle/story-dialog-stage";
 
@@ -12,87 +9,65 @@ export default {
 
 const noop = () => {};
 
-const defaultTarget: ThreadRenameDialogTarget = {
-  id: "thr_demo",
-  currentTitle: "Audit recurring permission failures",
-};
-
-const parentTarget: ThreadRenameDialogTarget = {
-  id: "thr_parent",
-  currentTitle: "Frontend Parent",
-};
-
-const longTitleTarget: ThreadRenameDialogTarget = {
-  id: "thr_long",
-  currentTitle:
-    "Investigate slow tests on recurring CI failures after the timeline pagination v2 merge",
-};
+function RenameStory({
+  draft,
+  validationMessage = null,
+  pending = false,
+}: {
+  draft: string;
+  validationMessage?: string | null;
+  pending?: boolean;
+}) {
+  const inputRef = useRef<HTMLInputElement | null>(null);
+  return (
+    <DialogStage>
+      <ThreadRenameDialogContent
+        draft={draft}
+        validationMessage={validationMessage}
+        pending={pending}
+        onDraftChange={noop}
+        onSubmit={noop}
+        inputRef={inputRef}
+      />
+    </DialogStage>
+  );
+}
 
 export function Overview() {
-  const inputRef = useRef<HTMLInputElement | null>(null);
   return (
     <StoryCard>
-      <StoryRow label="default" hint="thread, idle">
-        <DialogStage>
-          <ThreadRenameDialogContent
-            target={defaultTarget}
-            pending={false}
-            onRename={noop}
-            inputRef={inputRef}
-          />
-        </DialogStage>
+      <StoryRow label="default" hint="single segment — preview reads “No folder”">
+        <RenameStory draft="Audit recurring permission failures" />
       </StoryRow>
       <StoryRow
-        label="parent thread"
-        hint="parent threads use the same rename dialog copy"
+        label="folder preview"
+        hint="“/” reveals the folder + leaf beneath the input"
       >
-        <DialogStage>
-          <ThreadRenameDialogContent
-            target={parentTarget}
-            pending={false}
-            onRename={noop}
-            inputRef={inputRef}
-          />
-        </DialogStage>
+        <RenameStory draft="Work/Q3/Planning" />
+      </StoryRow>
+      <StoryRow
+        label="normalization (trailing/doubled slash)"
+        hint="preview reflects the normalized path, not the raw text"
+      >
+        <RenameStory draft="/Work//Q3/Planning/" />
+      </StoryRow>
+      <StoryRow
+        label="empty after normalize"
+        hint="all-slashes draft submits to an empty-name validation error"
+      >
+        <RenameStory draft="///" validationMessage="Thread name cannot be empty." />
       </StoryRow>
       <StoryRow
         label="pending"
         hint="submit in flight — input and submit are disabled"
       >
-        <DialogStage>
-          <ThreadRenameDialogContent
-            target={defaultTarget}
-            pending
-            onRename={noop}
-            inputRef={inputRef}
-          />
-        </DialogStage>
+        <RenameStory draft="Audit recurring permission failures" pending />
       </StoryRow>
       <StoryRow
         label="long title"
         hint="input overflows horizontally inside the dialog frame"
       >
-        <DialogStage>
-          <ThreadRenameDialogContent
-            target={longTitleTarget}
-            pending={false}
-            onRename={noop}
-            inputRef={inputRef}
-          />
-        </DialogStage>
-      </StoryRow>
-      <StoryRow
-        label="empty input"
-        hint="clear the field and submit to see the validation message"
-      >
-        <DialogStage>
-          <ThreadRenameDialogContent
-            target={{ id: "thr_blank", currentTitle: "" }}
-            pending={false}
-            onRename={noop}
-            inputRef={inputRef}
-          />
-        </DialogStage>
+        <RenameStory draft="Investigate slow tests on recurring CI failures after the timeline pagination v2 merge" />
       </StoryRow>
     </StoryCard>
   );
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
index d45e3e2d5..e074ba0c5 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
@@ -1,28 +1,44 @@
-import { capitalize } from "@bb/thread-view";
-import { useId, useState, type FormEvent, type RefObject } from "react";
+import { useId, type FormEvent, type RefObject } from "react";
 import { Button } from "@/components/ui/button.js";
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog.js";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.js";
 import { Input } from "@/components/ui/input.js";
-import { useNameValidation } from "./useNameValidation.js";
+import {
+  formatFolderPathLabel,
+  parseThreadFolderPath,
+} from "@/components/sidebar/folderPath";
 import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
 
 export interface ThreadRenameDialogTarget {
   id: string;
-  currentTitle: string;
 }
 
 interface ThreadRenameDialogProps {
   target: ThreadRenameDialogTarget | null;
+  // The draft is lifted into the provider so it survives a rename → first-folder
+  // modal → rename round trip; the dialog renders it as a controlled input.
+  draft: string;
+  validationMessage: string | null;
   pending?: boolean;
+  onDraftChange: (value: string) => void;
+  onSubmit: () => void;
   onOpenChange: (open: boolean) => void;
-  onRename: (threadId: string, title: string) => void;
 }
 
 export function ThreadRenameDialog({
   target,
+  draft,
+  validationMessage,
   pending = false,
+  onDraftChange,
+  onSubmit,
   onOpenChange,
-  onRename,
 }: ThreadRenameDialogProps) {
   const { inputRef, handleOpenAutoFocus } = useRenameDialogAutoFocus();
   return (
@@ -30,10 +46,11 @@ export function ThreadRenameDialog({
       <DialogContent onOpenAutoFocus={handleOpenAutoFocus}>
         {target ? (
           <ThreadRenameDialogContent
-            key={target.id}
-            target={target}
+            draft={draft}
+            validationMessage={validationMessage}
             pending={pending}
-            onRename={onRename}
+            onDraftChange={onDraftChange}
+            onSubmit={onSubmit}
             inputRef={inputRef}
           />
         ) : null}
@@ -43,66 +60,74 @@ export function ThreadRenameDialog({
 }
 
 export interface ThreadRenameDialogContentProps {
-  target: ThreadRenameDialogTarget;
+  draft: string;
+  validationMessage: string | null;
   pending: boolean;
-  onRename: (threadId: string, title: string) => void;
+  onDraftChange: (value: string) => void;
+  onSubmit: () => void;
   inputRef: RefObject<HTMLInputElement | null>;
 }
 
+// Reveals the folder the row normally hides: parses the current draft and shows
+// the resulting folder ancestors + leaf, or "No folder" for a single segment.
+function RenameFolderPreview({ draft }: { draft: string }) {
+  const { folders, leaf } = parseThreadFolderPath(draft);
+  if (folders.length === 0) {
+    return <p className="text-sm text-muted-foreground">No folder</p>;
+  }
+  return (
+    <p className="text-sm text-muted-foreground">
+      Folder:{" "}
+      <span className="text-foreground">{formatFolderPathLabel(folders)}</span>
+      {" · "}
+      Thread: <span className="text-foreground">{leaf}</span>
+    </p>
+  );
+}
+
 export function ThreadRenameDialogContent({
-  target,
+  draft,
+  validationMessage,
   pending,
-  onRename,
+  onDraftChange,
+  onSubmit,
   inputRef,
 }: ThreadRenameDialogContentProps) {
   const inputId = useId();
-  const [nextTitle, setNextTitle] = useState(target.currentTitle);
-  const label = "thread";
-  const { validationMessage, validate, clearMessage } = useNameValidation({
-    emptyMessage: `${capitalize(label)} name cannot be empty.`,
-  });
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     if (pending) return;
-
-    const trimmedTitle = validate(nextTitle);
-    if (trimmedTitle === null) return;
-
-    onRename(target.id, trimmedTitle);
+    onSubmit();
   };
 
   return (
     <>
       <DialogHeader>
-        <DialogTitle>Rename {label}</DialogTitle>
-        <DialogDescription>
-          Choose a new name for this {label}.
-        </DialogDescription>
+        <DialogTitle>Rename thread</DialogTitle>
+        <DialogDescription>Choose a new name for this thread.</DialogDescription>
       </DialogHeader>
       <form className="space-y-4" onSubmit={handleSubmit}>
         <div className="space-y-2">
           <Input
             ref={inputRef}
             id={inputId}
-            aria-label={`${capitalize(label)} name`}
-            value={nextTitle}
+            aria-label="Thread name"
+            value={draft}
             autoCapitalize="sentences"
             autoCorrect="off"
             spellCheck={false}
             disabled={pending}
-            onChange={(event) => {
-              setNextTitle(event.target.value);
-              clearMessage();
-            }}
+            onChange={(event) => onDraftChange(event.target.value)}
           />
+          <RenameFolderPreview draft={draft} />
           {validationMessage ? (
             <p className="text-sm text-destructive">{validationMessage}</p>
           ) : null}
         </div>
         <DialogFooter>
           <Button type="submit" disabled={pending}>
-            Rename {label}
+            Rename thread
           </Button>
         </DialogFooter>
       </form>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 8134f50b8..724dade35 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -97,7 +97,7 @@ import {
   type SidebarOrganizationMode,
   type SidebarSectionId,
 } from "./sidebarCollapsedAtoms";
-import { buildFolderKey, parseThreadFolderPath } from "./folderPath";
+import { folderAncestorKeys } from "./folderPath";
 import {
   CHRONOLOGICAL_CONTAINER_ID,
   PINNED_CONTAINER_ID,
@@ -1304,26 +1304,27 @@ function ProjectListComponent({
       removeCollapsedIds(current, environmentIdsToExpand),
     );
 
-    // Under Group by: Folder, also un-collapse the selected thread's folder
-    // ancestors so it can't hide behind a collapsed folder. The folder key is
-    // scoped to whichever section renders the thread (pinned / chronological /
-    // its project), matching how the assembly sites namespace folder keys.
+    // Under Group by: Folder, also un-collapse the folder ancestors hiding the
+    // selected thread. Folders derive from the TOP-LEVEL bucketed thread's
+    // title, not the selected child's own (a child's "/" is ignored) — so in
+    // project/pinned mode use the top-level ancestor the walk above ended on;
+    // in the flat chronological list the selected thread is itself top-level.
     if (groupBy === "folder") {
-      const { folders } = parseThreadFolderPath(selectedThread.title ?? "");
-      if (folders.length > 0) {
-        const folderContainerId = pinnedSidebarState.effectivePinnedThreadIds.has(
-          selectedThreadId,
-        )
-          ? PINNED_CONTAINER_ID
-          : organizationMode === "chronological"
-            ? CHRONOLOGICAL_CONTAINER_ID
-            : selectedThread.projectId;
-        const folderKeysToExpand = new Set<string>();
-        for (let depth = 1; depth <= folders.length; depth += 1) {
-          folderKeysToExpand.add(
-            buildFolderKey(folderContainerId, folders.slice(0, depth)),
-          );
-        }
+      const isPinned =
+        pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
+      const isChronological =
+        !isPinned && organizationMode === "chronological";
+      const topLevelAncestor = currentThread ?? selectedThread;
+      const folderSource = isChronological ? selectedThread : topLevelAncestor;
+      const folderContainerId = isPinned
+        ? PINNED_CONTAINER_ID
+        : isChronological
+          ? CHRONOLOGICAL_CONTAINER_ID
+          : selectedThread.projectId;
+      const folderKeysToExpand = new Set(
+        folderAncestorKeys(folderContainerId, folderSource.title ?? ""),
+      );
+      if (folderKeysToExpand.size > 0) {
         setCollapsedFolderList((current) =>
           removeCollapsedIds(current, folderKeysToExpand),
         );
diff --git a/apps/app/src/components/sidebar/folderPath.test.ts b/apps/app/src/components/sidebar/folderPath.test.ts
index 5943bf2c5..5f7f23956 100644
--- a/apps/app/src/components/sidebar/folderPath.test.ts
+++ b/apps/app/src/components/sidebar/folderPath.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   buildFolderKey,
+  folderAncestorKeys,
   normalizeThreadTitle,
   parseThreadFolderPath,
   titleCreatesFolder,
@@ -109,3 +110,29 @@ describe("buildFolderKey", () => {
     );
   });
 });
+
+describe("folderAncestorKeys", () => {
+  it("returns every ancestor folder key, outermost first", () => {
+    expect(folderAncestorKeys("proj_1", "Work/Q3/Plan")).toEqual([
+      "proj_1::Work",
+      "proj_1::Work/Q3",
+    ]);
+  });
+
+  it("returns no keys for a title with no folder", () => {
+    expect(folderAncestorKeys("proj_1", "Standalone")).toEqual([]);
+    expect(folderAncestorKeys("proj_1", "Work/")).toEqual([]);
+  });
+
+  it("excludes the leaf — only the folders that contain the thread", () => {
+    // "A/B" lives in folder "A"; "B" is the thread, not a folder.
+    expect(folderAncestorKeys("pinned", "A/B")).toEqual(["pinned::A"]);
+  });
+
+  it("namespaces by container, including the global sentinels", () => {
+    expect(folderAncestorKeys("pinned", "A/B/C")).toEqual([
+      "pinned::A",
+      "pinned::A/B",
+    ]);
+  });
+});
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
index d4fa340a6..be133dbe2 100644
--- a/apps/app/src/components/sidebar/folderPath.ts
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -52,6 +52,22 @@ export function titleCreatesFolder(title: string): boolean {
   return parseThreadFolderPath(title).folders.length > 0;
 }
 
+// Every ancestor folder key for a title, outermost first — e.g. "Work/Q3/Plan"
+// in container "p" → ["p::Work", "p::Work/Q3"]. Used to un-collapse the folders
+// hiding a selected thread. Derive `title` from the thread that is actually
+// bucketed (a section's top-level thread), since a nested child's "/" is ignored.
+export function folderAncestorKeys(
+  containerId: string,
+  title: string,
+): string[] {
+  const { folders } = parseThreadFolderPath(title);
+  const keys: string[] = [];
+  for (let depth = 1; depth <= folders.length; depth += 1) {
+    keys.push(buildFolderKey(containerId, folders.slice(0, depth)));
+  }
+  return keys;
+}
+
 // Human-readable folder path, used for tooltips, accessible names, and the
 // rename preview ("Work › Q3 › Planning"). The visible separator differs from
 // the stored "/" so a path reads as breadcrumbs, not a literal title.
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index cf79ff9e4..d51494d1e 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -5,8 +5,10 @@ import {
   useEffect,
   useMemo,
   useRef,
+  useState,
   type ReactNode,
 } from "react";
+import { useAtom } from "jotai";
 import { useNavigate } from "react-router-dom";
 import { appToast } from "@/components/ui/app-toast";
 import { defaultExperiments, type Thread } from "@bb/domain";
@@ -32,6 +34,17 @@ import {
   ThreadRenameDialog,
   type ThreadRenameDialogTarget,
 } from "@/components/dialogs/ThreadRenameDialog";
+import { FolderOnboardingDialog } from "@/components/dialogs/FolderOnboardingDialog";
+import {
+  formatFolderPathLabel,
+  normalizeThreadTitle,
+  parseThreadFolderPath,
+  titleCreatesFolder,
+} from "@/components/sidebar/folderPath";
+import {
+  folderOnboardingSeenAtom,
+  sidebarGroupByAtom,
+} from "@/components/sidebar/sidebarCollapsedAtoms";
 import {
   ThreadDeleteDialog,
   type ThreadDeleteDialogTarget,
@@ -85,6 +98,13 @@ interface ThreadActionContext {
   childThreadCount: number;
 }
 
+// Full breadcrumb segments for the first-folder modal preview
+// ("Work › Q3 › Planning"): the folder ancestors plus the leaf.
+function folderPreviewSegments(title: string): string[] {
+  const { folders, leaf } = parseThreadFolderPath(title);
+  return [...folders, leaf];
+}
+
 export function ThreadActionsProvider({
   children,
 }: ThreadActionsProviderProps) {
@@ -121,6 +141,23 @@ export function ThreadActionsProvider({
   const { onClose: closeRenameDialog, onOpen: openRenameDialog } = renameDialog;
   const { onClose: closeDeleteDialog, onOpen: openDeleteDialog } = deleteDialog;
 
+  // The rename draft is lifted here (not local to the dialog) so it survives a
+  // rename → first-folder modal → rename round trip.
+  const [renameDraft, setRenameDraft] = useState("");
+  const [renameValidationError, setRenameValidationError] = useState<
+    string | null
+  >(null);
+  // Stashed rename awaiting first-folder confirmation; null when the modal is
+  // closed. Holds the raw draft so a decline can reopen rename unchanged.
+  const [pendingFolderRename, setPendingFolderRename] = useState<{
+    threadId: string;
+    draft: string;
+  } | null>(null);
+  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
+    folderOnboardingSeenAtom,
+  );
+  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
+
   useEffect(() => {
     return () => {
       threadActionContextAbortRef.current?.abort();
@@ -142,26 +179,88 @@ export function ThreadActionsProvider({
 
   const requestRename = useCallback(
     (thread: Thread) => {
-      openRenameDialog({
-        id: thread.id,
-        currentTitle: getThreadDisplayTitle(thread),
-      });
+      // Seed from the raw stored title (not the display fallback) so an
+      // untitled thread never parses "Thread xxxx" as a folder path.
+      setRenameDraft(thread.title ?? "");
+      setRenameValidationError(null);
+      openRenameDialog({ id: thread.id });
     },
     [openRenameDialog],
   );
 
-  const submitRename = useCallback(
-    (threadId: string, title: string) => {
-      updateMutate(
-        { id: threadId, title },
-        {
-          onSuccess: () => {
-            closeRenameDialog();
-          },
+  const handleRenameDraftChange = useCallback((value: string) => {
+    setRenameDraft(value);
+    setRenameValidationError(null);
+  }, []);
+
+  const submitRename = useCallback(() => {
+    const target = renameDialog.target;
+    if (!target) return;
+    const normalized = normalizeThreadTitle(renameDraft);
+    if (!normalized) {
+      setRenameValidationError("Thread name cannot be empty.");
+      return;
+    }
+    // First time a rename creates a folder: stash and teach via the modal
+    // before submitting. Afterwards (seen === true) slash renames submit directly.
+    if (titleCreatesFolder(normalized) && !folderOnboardingSeen) {
+      setPendingFolderRename({ threadId: target.id, draft: renameDraft });
+      closeRenameDialog();
+      return;
+    }
+    updateMutate(
+      { id: target.id, title: normalized },
+      { onSuccess: () => closeRenameDialog() },
+    );
+  }, [
+    closeRenameDialog,
+    folderOnboardingSeen,
+    renameDialog.target,
+    renameDraft,
+    updateMutate,
+  ]);
+
+  const handleFolderOnboardingConfirm = useCallback(() => {
+    if (!pendingFolderRename) return;
+    const { threadId, draft } = pendingFolderRename;
+    updateMutate(
+      { id: threadId, title: normalizeThreadTitle(draft) },
+      {
+        onSuccess: () => {
+          setFolderOnboardingSeen(true);
+          // Auto-enable folder grouping once, so the new folder is visible.
+          if (groupBy === "none") {
+            setGroupBy("folder");
+          }
+          setPendingFolderRename(null);
         },
-      );
+      },
+    );
+  }, [
+    groupBy,
+    pendingFolderRename,
+    setFolderOnboardingSeen,
+    setGroupBy,
+    updateMutate,
+  ]);
+
+  const handleFolderOnboardingCancel = useCallback(() => {
+    if (!pendingFolderRename) return;
+    // Reopen rename seeded from the stashed draft; seen stays false so the
+    // modal still teaches on a later attempt.
+    setRenameDraft(pendingFolderRename.draft);
+    setRenameValidationError(null);
+    openRenameDialog({ id: pendingFolderRename.threadId });
+    setPendingFolderRename(null);
+  }, [openRenameDialog, pendingFolderRename]);
+
+  const handleFolderOnboardingOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) {
+        handleFolderOnboardingCancel();
+      }
     },
-    [closeRenameDialog, updateMutate],
+    [handleFolderOnboardingCancel],
   );
 
   // Fetches the delete dialog context. Returns null when the caller's request
@@ -404,9 +503,27 @@ export function ThreadActionsProvider({
       {children}
       <ThreadRenameDialog
         target={renameDialog.target}
+        draft={renameDraft}
+        validationMessage={renameValidationError}
         pending={updateThread.isPending}
+        onDraftChange={handleRenameDraftChange}
+        onSubmit={submitRename}
         onOpenChange={renameDialog.onOpenChange}
-        onRename={submitRename}
+      />
+      <FolderOnboardingDialog
+        open={pendingFolderRename !== null}
+        pathLabel={
+          pendingFolderRename
+            ? formatFolderPathLabel(
+                folderPreviewSegments(pendingFolderRename.draft),
+              )
+            : ""
+        }
+        showGroupingHint={groupBy === "none"}
+        pending={updateThread.isPending}
+        onConfirm={handleFolderOnboardingConfirm}
+        onCancel={handleFolderOnboardingCancel}
+        onOpenChange={handleFolderOnboardingOpenChange}
       />
       <ThreadDeleteDialog
         target={deleteDialog.target}

From b66305095e1ecc4ced47cd50d3ee337d861b8083 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 20:56:56 -0700
Subject: [PATCH 04/54] Add manual sidebar sort state (S5)

---
 .../src/components/sidebar/ProjectList.tsx    |  29 ++--
 .../app/src/components/sidebar/ProjectRow.tsx |  24 ++-
 .../sidebar/projectThreadGroups.test.ts       |  73 +++++++-
 .../components/sidebar/projectThreadGroups.ts | 158 +++++++++++++++---
 .../sidebar/sidebarCollapsedAtoms.ts          |  24 ++-
 5 files changed, 254 insertions(+), 54 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 724dade35..7da10463e 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -576,6 +576,14 @@ function SidebarViewOptionsMenu({
             setChronologicalSort("created");
           }}
         />
+        <SidebarOrganizeMenuOption
+          label="None"
+          selected={chronologicalSort === "none"}
+          onSelect={(event) => {
+            event.preventDefault();
+            setChronologicalSort("none");
+          }}
+        />
         <DropdownMenuSeparator />
         <SidebarOrganizeMenuSectionLabel className="pt-2">
           Group by
@@ -708,12 +716,11 @@ function TopLevelSidebarSection({
     },
     [collapseControl],
   );
-  const handleSectionLabelClick = useCallback<MouseEventHandler<HTMLDivElement>>(
-    () => {
-      collapseControl?.onToggleCollapsed();
-    },
-    [collapseControl],
-  );
+  const handleSectionLabelClick = useCallback<
+    MouseEventHandler<HTMLDivElement>
+  >(() => {
+    collapseControl?.onToggleCollapsed();
+  }, [collapseControl]);
   const stopActionsClick = useCallback<MouseEventHandler<HTMLSpanElement>>(
     (event) => {
       event.stopPropagation();
@@ -804,9 +811,7 @@ function TopLevelSidebarSection({
             onClick={stopActionsClick}
           >
             <span
-              data-sidebar-hover-actions-open={
-                actionsOpen ? "true" : undefined
-              }
+              data-sidebar-hover-actions-open={actionsOpen ? "true" : undefined}
               data-sidebar-hover-actions-mobile={
                 actionsMobileAlways
                   ? SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
@@ -1312,8 +1317,7 @@ function ProjectListComponent({
     if (groupBy === "folder") {
       const isPinned =
         pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
-      const isChronological =
-        !isPinned && organizationMode === "chronological";
+      const isChronological = !isPinned && organizationMode === "chronological";
       const topLevelAncestor = currentThread ?? selectedThread;
       const folderSource = isChronological ? selectedThread : topLevelAncestor;
       const folderContainerId = isPinned
@@ -1516,8 +1520,7 @@ function ProjectListComponent({
   const nonPinnedThreads = useMemo(
     () =>
       threads.filter(
-        (thread) =>
-          !pinnedSidebarState.effectivePinnedThreadIds.has(thread.id),
+        (thread) => !pinnedSidebarState.effectivePinnedThreadIds.has(thread.id),
       ),
     [pinnedSidebarState.effectivePinnedThreadIds, threads],
   );
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 885414a29..93bec596c 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -76,13 +76,12 @@ import {
   type ThreadComparator,
 } from "./projectThreadGroups";
 import { SidebarFolderRow } from "./SidebarFolderRow";
+import { formatFolderPathLabel, parseThreadFolderPath } from "./folderPath";
 import {
-  formatFolderPathLabel,
-  parseThreadFolderPath,
-} from "./folderPath";
-import {
+  sidebarChronologicalSortAtom,
   sidebarCollapsedFoldersAtom,
   sidebarGroupByAtom,
+  sidebarManualOrderAtom,
 } from "./sidebarCollapsedAtoms";
 import {
   SIDEBAR_PROJECT_GROUP_LINE_CLASS,
@@ -1200,6 +1199,8 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   onToggleEnvironmentCollapsed,
 }: ProjectThreadTreeProps) {
   const groupBy = useAtomValue(sidebarGroupByAtom);
+  const chronologicalSort = useAtomValue(sidebarChronologicalSortAtom);
+  const manualOrder = useAtomValue(sidebarManualOrderAtom);
   const projectThreads =
     threadListState.status === "ready"
       ? threadListState.threads
@@ -1209,8 +1210,16 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
       buildProjectThreadGroups(projectThreads, compareThreads, {
         groupBy,
         containerId: projectId,
+        manualOrder: chronologicalSort === "none" ? manualOrder : undefined,
       }),
-    [compareThreads, projectThreads, groupBy, projectId],
+    [
+      chronologicalSort,
+      compareThreads,
+      projectThreads,
+      groupBy,
+      manualOrder,
+      projectId,
+    ],
   );
 
   if (threadListState.status === "loading") {
@@ -1286,6 +1295,8 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   onToggleEnvironmentCollapsed,
 }: ChronologicalThreadTreeProps) {
   const groupBy = useAtomValue(sidebarGroupByAtom);
+  const chronologicalSort = useAtomValue(sidebarChronologicalSortAtom);
+  const manualOrder = useAtomValue(sidebarManualOrderAtom);
   const threads =
     threadListState.status === "ready"
       ? threadListState.threads
@@ -1295,8 +1306,9 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
       buildChronologicalThreadList(threads, compareThreads, {
         groupBy,
         containerId: CHRONOLOGICAL_CONTAINER_ID,
+        manualOrder: chronologicalSort === "none" ? manualOrder : undefined,
       }),
-    [threads, compareThreads, groupBy],
+    [chronologicalSort, threads, compareThreads, groupBy, manualOrder],
   );
 
   if (threadListState.status === "loading") {
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
index 8189eba50..0ca411624 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.test.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -6,6 +6,7 @@ import {
   buildProjectThreadGroups,
   compareByCreatedAtDescending,
   compareStandardThreads,
+  pruneManualOrderForChildren,
   type ProjectThreadItem,
   type ProjectThreadNode,
 } from "./projectThreadGroups";
@@ -459,6 +460,61 @@ describe("buildProjectThreadGroups", () => {
   });
 });
 
+describe("manual order (Sort by: None)", () => {
+  it("orders a flat project section by stored manual order with new items at the top", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({ id: "new", latestAttentionAt: 30 }),
+        createThread({ id: "stored-b", latestAttentionAt: 20 }),
+        createThread({ id: "stored-a", latestAttentionAt: 10 }),
+      ],
+      compareStandardThreads,
+      {
+        groupBy: "none",
+        containerId: "proj_1",
+        manualOrder: {
+          proj_1: ["stored-a", "stored-b"],
+        },
+      },
+    );
+
+    expect(summarizeItems(items)).toEqual(["new", "stored-a", "stored-b"]);
+  });
+
+  it("lets manual folder mode interleave folders and loose threads by parent", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({ id: "a", title: "Work/A", latestAttentionAt: 30 }),
+        createThread({ id: "b", title: "Work/B", latestAttentionAt: 20 }),
+        createThread({ id: "loose", title: "Loose", latestAttentionAt: 10 }),
+      ],
+      compareStandardThreads,
+      {
+        groupBy: "folder",
+        containerId: "proj_1",
+        manualOrder: {
+          proj_1: ["loose", "proj_1::Work"],
+          "proj_1::Work": ["b", "a"],
+        },
+      },
+    );
+
+    expect(summarizeItems(items)).toEqual([
+      "loose",
+      { folder: "proj_1::Work", items: ["b", "a"] },
+    ]);
+  });
+
+  it("prunes stale and duplicate stored ids on read", () => {
+    expect(
+      pruneManualOrderForChildren(
+        ["missing", "b", "b", "a"],
+        new Set(["a", "b"]),
+      ),
+    ).toEqual(["b", "a"]);
+  });
+});
+
 const FOLDER_OPTIONS = { groupBy: "folder", containerId: "proj_1" } as const;
 
 describe("folder bucketing (Group by: Folder)", () => {
@@ -479,10 +535,7 @@ describe("folder bucketing (Group by: Folder)", () => {
     expect(summarizeItems(items)).toEqual([
       {
         folder: "proj_1::Work",
-        items: [
-          { folder: "proj_1::Work/Q3", items: ["a", "b"] },
-          "c",
-        ],
+        items: [{ folder: "proj_1::Work/Q3", items: ["a", "b"] }, "c"],
       },
       "d",
     ]);
@@ -562,7 +615,11 @@ describe("folder bucketing (Group by: Folder)", () => {
     // Standard comparator pins the active folder's representative first.
     expect(
       summarizeItems(
-        buildProjectThreadGroups(threads, compareStandardThreads, FOLDER_OPTIONS),
+        buildProjectThreadGroups(
+          threads,
+          compareStandardThreads,
+          FOLDER_OPTIONS,
+        ),
       ),
     ).toEqual([
       { folder: "proj_1::FolderA", items: ["old-active"] },
@@ -587,7 +644,11 @@ describe("folder bucketing (Group by: Folder)", () => {
   it("rolls descendant count + activity up onto the folder group", () => {
     const items = bucketIntoFolders(
       buildProjectThreadGroups([
-        createThread({ id: "busy", title: "Work/Busy", hasPendingInteraction: true }),
+        createThread({
+          id: "busy",
+          title: "Work/Busy",
+          hasPendingInteraction: true,
+        }),
         createThread({ id: "quiet", title: "Work/Quiet" }),
       ]),
       "proj_1",
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.ts b/apps/app/src/components/sidebar/projectThreadGroups.ts
index 703b52f1e..6f3af0ad5 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.ts
@@ -8,7 +8,10 @@ import {
   type CollapsedChildActivity,
 } from "@/lib/thread-activity";
 import { buildFolderKey, parseThreadFolderPath } from "./folderPath";
-import type { SidebarGroupBy } from "./sidebarCollapsedAtoms";
+import type {
+  SidebarGroupBy,
+  SidebarManualOrder,
+} from "./sidebarCollapsedAtoms";
 
 export interface ProjectThreadNodeStats {
   childCount: number;
@@ -64,6 +67,7 @@ export type ProjectThreadItem =
 export interface SidebarFolderOptions {
   groupBy: SidebarGroupBy;
   containerId: string;
+  manualOrder?: SidebarManualOrder;
 }
 
 // Container-id sentinels for the global (non-project) sections; project
@@ -351,11 +355,27 @@ export function buildProjectThreadGroups(
   }
 
   const rootItems = buildSortedItems(rootNodes, compareThreads);
-  // Group by: None — return today's output untouched, no folder logic.
+  // Group by: None — return today's output untouched unless Sort: None has
+  // explicitly supplied a manual order for this section.
   if (folderOptions?.groupBy !== "folder") {
+    if (folderOptions?.manualOrder) {
+      return orderSiblingItems(
+        rootItems,
+        folderOptions.containerId,
+        compareThreads,
+        {
+          manualOrder: folderOptions.manualOrder,
+        },
+      );
+    }
     return rootItems;
   }
-  return bucketIntoFolders(rootItems, folderOptions.containerId, compareThreads);
+  return bucketIntoFolders(
+    rootItems,
+    folderOptions.containerId,
+    compareThreads,
+    folderOptions.manualOrder,
+  );
 }
 
 // Flat ordering for the chronological "All Threads" bucket: one top-level row
@@ -383,11 +403,27 @@ export function buildChronologicalThreadList(
         },
       }),
     );
-  // Group by: None — flat globally-sorted list, no folder logic.
+  // Group by: None — flat globally-sorted list, no folder logic unless Sort:
+  // None has explicitly supplied a manual order for the chronological section.
   if (folderOptions?.groupBy !== "folder") {
+    if (folderOptions?.manualOrder) {
+      return orderSiblingItems(
+        items,
+        folderOptions.containerId,
+        compareThreads,
+        {
+          manualOrder: folderOptions.manualOrder,
+        },
+      );
+    }
     return items;
   }
-  return bucketIntoFolders(items, folderOptions.containerId, compareThreads);
+  return bucketIntoFolders(
+    items,
+    folderOptions.containerId,
+    compareThreads,
+    folderOptions.manualOrder,
+  );
 }
 
 export function isSidebarProjectThread(
@@ -421,9 +457,7 @@ function bucketWorktreeEnvironmentGroups(
   const environmentThreadGroups: EnvironmentThreadGroup[] = [];
   for (const [environmentId, bucket] of nodesByEnvironmentId) {
     if (!hasAtLeastTwoThreadNodes(bucket)) continue;
-    bucket.sort((left, right) =>
-      compareThreads(left.thread, right.thread),
-    );
+    bucket.sort((left, right) => compareThreads(left.thread, right.thread));
     groupedEnvironmentIds.add(environmentId);
     environmentThreadGroups.push(
       buildEnvironmentThreadGroup(environmentId, bucket),
@@ -435,9 +469,7 @@ function bucketWorktreeEnvironmentGroups(
       node.thread.environmentId === null ||
       !groupedEnvironmentIds.has(node.thread.environmentId),
   );
-  looseNodes.sort((left, right) =>
-    compareThreads(left.thread, right.thread),
-  );
+  looseNodes.sort((left, right) => compareThreads(left.thread, right.thread));
 
   return { environmentThreadGroups, looseNodes };
 }
@@ -466,6 +498,10 @@ interface FolderBucket {
   items: ProjectThreadItem[];
 }
 
+interface ManualOrderSiblingOptions {
+  manualOrder?: SidebarManualOrder;
+}
+
 function createFolderBucket(): FolderBucket {
   return { subfolders: new Map(), items: [] };
 }
@@ -483,23 +519,95 @@ function getItemOrderingThread(
     case "environment":
       return item.group.nodes[0].thread;
     case "folder":
-      return getItemThreadDescendants(item.group.items).reduce((first, thread) =>
-        compareThreads(thread, first) < 0 ? thread : first,
+      return getItemThreadDescendants(item.group.items).reduce(
+        (first, thread) => (compareThreads(thread, first) < 0 ? thread : first),
       );
   }
 }
 
+export function getManualOrderItemKey(item: ProjectThreadItem): string {
+  switch (item.kind) {
+    case "thread":
+      return item.node.thread.id;
+    case "environment":
+      return item.group.nodes[0].thread.id;
+    case "folder":
+      return item.group.key;
+  }
+}
+
+export function pruneManualOrderForChildren(
+  storedOrder: readonly string[] | undefined,
+  childKeys: ReadonlySet<string>,
+): string[] {
+  if (!storedOrder) {
+    return [];
+  }
+
+  const seen = new Set<string>();
+  const pruned: string[] = [];
+  for (const key of storedOrder) {
+    if (!childKeys.has(key) || seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    pruned.push(key);
+  }
+  return pruned;
+}
+
+function orderItemsByManualOrder(
+  items: readonly ProjectThreadItem[],
+  parentKey: string,
+  compareThreads: ThreadComparator,
+  manualOrder: SidebarManualOrder,
+): ProjectThreadItem[] {
+  const itemsByKey = new Map<string, ProjectThreadItem>();
+  for (const item of items) {
+    itemsByKey.set(getManualOrderItemKey(item), item);
+  }
+
+  const childKeys = new Set(itemsByKey.keys());
+  const prunedOrder = pruneManualOrderForChildren(
+    manualOrder[parentKey],
+    childKeys,
+  );
+  const orderedKeys = new Set(prunedOrder);
+  const unorderedItems = items
+    .filter((item) => !orderedKeys.has(getManualOrderItemKey(item)))
+    .sort((left, right) =>
+      compareThreads(
+        getItemOrderingThread(left, compareThreads),
+        getItemOrderingThread(right, compareThreads),
+      ),
+    );
+  const orderedItems = prunedOrder.flatMap((key) => {
+    const item = itemsByKey.get(key);
+    return item ? [item] : [];
+  });
+
+  return [...unorderedItems, ...orderedItems];
+}
+
 // The one sibling-ordering hook. Today it orders folders-first, each block by
-// the active comparator (ties already handled inside the comparator's codepoint
-// fallback). `parentKey` is unused here but is the seam Sort: None (manual
-// order) swaps to a stored per-parent order; threading it now keeps that change
-// from re-cutting the tree walk.
+// the active comparator. Under Sort: None it instead applies the stored
+// per-parent manual order; missing child keys stay at the top in fallback order
+// until the first drag writes a complete order for that parent.
 function orderSiblingItems(
   items: readonly ProjectThreadItem[],
-  // Seam for Sort: None — manual order will key off this parent. Unused today.
-  _parentKey: string,
+  parentKey: string,
   compareThreads: ThreadComparator,
+  options: ManualOrderSiblingOptions = {},
 ): ProjectThreadItem[] {
+  if (options.manualOrder) {
+    return orderItemsByManualOrder(
+      items,
+      parentKey,
+      compareThreads,
+      options.manualOrder,
+    );
+  }
+
   const decorated = items.map((item) => ({
     item,
     isFolder: item.kind === "folder",
@@ -536,6 +644,7 @@ function buildFolderLevelItems(
   containerId: string,
   parentPath: readonly string[],
   compareThreads: ThreadComparator,
+  manualOrder?: SidebarManualOrder,
 ): ProjectThreadItem[] {
   const folderItems: ProjectThreadItem[] = [];
   for (const [name, subBucket] of bucket.subfolders) {
@@ -545,6 +654,7 @@ function buildFolderLevelItems(
       containerId,
       path,
       compareThreads,
+      manualOrder,
     );
     folderItems.push({
       kind: "folder",
@@ -559,6 +669,7 @@ function buildFolderLevelItems(
     [...folderItems, ...bucket.items],
     parentKey,
     compareThreads,
+    { manualOrder },
   );
 }
 
@@ -570,6 +681,7 @@ export function bucketIntoFolders(
   items: readonly ProjectThreadItem[],
   containerId: string,
   compareThreads: ThreadComparator = compareStandardThreads,
+  manualOrder?: SidebarManualOrder,
 ): ProjectThreadItem[] {
   const root = createFolderBucket();
   for (const item of items) {
@@ -586,5 +698,11 @@ export function bucketIntoFolders(
     }
     bucket.items.push(item);
   }
-  return buildFolderLevelItems(root, containerId, [], compareThreads);
+  return buildFolderLevelItems(
+    root,
+    containerId,
+    [],
+    compareThreads,
+    manualOrder,
+  );
 }
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 01637103d..9c9742f2b 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -11,26 +11,25 @@ const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
 const FOLDER_ONBOARDING_SEEN_STORAGE_KEY = "bb.sidebar.folderOnboardingSeen";
+const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 
-export type SidebarSectionId =
-  | "pinned"
-  | "projects"
-  | "threads";
-export type CollapsibleSidebarSectionId =
-  | "projects"
-  | "threads";
+export type SidebarSectionId = "pinned" | "projects" | "threads";
+export type CollapsibleSidebarSectionId = "projects" | "threads";
 
 // "project" keeps the per-project grouping; "chronological" flattens every
 // non-pinned thread into a single All Threads bucket.
 export type SidebarOrganizationMode = "project" | "chronological";
 // Controls thread ordering in both grouped and ungrouped sidebar views.
 // "updated" reuses the status-aware activity heuristic; "created" sorts by
-// the literal createdAt field.
-export type SidebarChronologicalSort = "updated" | "created";
+// the literal createdAt field; "none" applies the user's local manual order.
+export type SidebarChronologicalSort = "updated" | "created" | "none";
 // Whether "/" in a thread title renders as nested folders. Orthogonal to the
 // organization mode and sort: "none" keeps today's flat behavior (literal
 // titles), "folder" buckets top-level threads into derived folders.
 export type SidebarGroupBy = "none" | "folder";
+// Per-parent manual order for Sort: None. Keys are section/folder parent keys;
+// values are child thread ids and child folder keys.
+export type SidebarManualOrder = Record<string, string[]>;
 
 export const DEFAULT_SIDEBAR_SECTION_ORDER: readonly SidebarSectionId[] = [
   "pinned",
@@ -116,3 +115,10 @@ export const folderOnboardingSeenAtom = atomWithStorage<boolean>(
   createJsonLocalStorage<boolean>(),
   { getOnInit: true },
 );
+
+export const sidebarManualOrderAtom = atomWithStorage<SidebarManualOrder>(
+  MANUAL_ORDER_STORAGE_KEY,
+  {},
+  createJsonLocalStorage<SidebarManualOrder>(),
+  { getOnInit: true },
+);

From 2377cf0b29d9698ba00bd798aed39fab07c24581 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 21:04:42 -0700
Subject: [PATCH 05/54] Add manual sidebar drag reordering (S6)

---
 .../app/src/components/sidebar/ProjectRow.tsx | 471 ++++++++++++++++--
 .../components/sidebar/SidebarFolderRow.tsx   |  45 +-
 apps/app/src/components/sidebar/ThreadRow.tsx |  34 +-
 .../src/components/sidebar/folderPath.test.ts |  23 +-
 apps/app/src/components/sidebar/folderPath.ts |  10 +
 5 files changed, 511 insertions(+), 72 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 93bec596c..a3745d03d 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -8,6 +8,11 @@ import {
   type ReactNode,
 } from "react";
 import { useAtomValue, useSetAtom } from "jotai";
+import { DndContext, type DragEndEvent } from "@dnd-kit/core";
+import {
+  SortableContext,
+  verticalListSortingStrategy,
+} from "@dnd-kit/sortable";
 import type { ThreadListEntry } from "@bb/domain";
 import type { ProjectResponse } from "@bb/server-contract";
 import { NavLink, useNavigate } from "react-router-dom";
@@ -17,6 +22,7 @@ import {
   useArchiveEnvironmentThreads,
   useUpdateEnvironment,
 } from "@/hooks/mutations/environment-mutations";
+import { useUpdateThread } from "@/hooks/mutations/thread-state-mutations";
 import { useDialogState } from "@/hooks/useDialogState";
 import { Button } from "@/components/ui/button.js";
 import {
@@ -69,6 +75,7 @@ import {
   buildChronologicalThreadList,
   buildProjectThreadGroups,
   CHRONOLOGICAL_CONTAINER_ID,
+  getManualOrderItemKey,
   type EnvironmentThreadGroup,
   type ProjectThreadItem,
   type ProjectThreadNode,
@@ -76,12 +83,17 @@ import {
   type ThreadComparator,
 } from "./projectThreadGroups";
 import { SidebarFolderRow } from "./SidebarFolderRow";
-import { formatFolderPathLabel, parseThreadFolderPath } from "./folderPath";
+import {
+  buildThreadTitleForFolderPath,
+  formatFolderPathLabel,
+  parseThreadFolderPath,
+} from "./folderPath";
 import {
   sidebarChronologicalSortAtom,
   sidebarCollapsedFoldersAtom,
   sidebarGroupByAtom,
   sidebarManualOrderAtom,
+  type SidebarManualOrder,
 } from "./sidebarCollapsedAtoms";
 import {
   SIDEBAR_PROJECT_GROUP_LINE_CLASS,
@@ -91,9 +103,14 @@ import {
   getSidebarThreadGroupLineLeft,
   getSidebarThreadRowPaddingLeft,
 } from "./sidebarRowClasses";
-import { type SidebarSortableDragBindings } from "./sortableMotion";
+import {
+  useSidebarSortable,
+  type SidebarSortableDragBindings,
+} from "./sortableMotion";
 import type { ConsumeDragClickSuppression } from "@/components/ui/use-drag-click-suppression";
 import { SidebarChildToggleChevron } from "./SidebarChildToggleChevron";
+import type { SidebarReorderDndContextProps } from "./useSidebarReorderDnd";
+import { useSidebarReorderDnd } from "./useSidebarReorderDnd";
 
 // Pin the project row plus this many parent levels (parent threads,
 // worktree group headers); rows deeper than the cap render non-sticky so a deep
@@ -206,6 +223,11 @@ interface ThreadTreeItemRowProps {
   onProjectSelect?: () => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
+  consumeClickSuppression?: ConsumeDragClickSuppression;
+  dragBindings?: SidebarSortableDragBindings;
+  manualSort?: ManualThreadTreeDndState;
+  sortableRef?: (element: HTMLDivElement | null) => void;
+  sortableStyle?: CSSProperties;
 }
 
 interface FolderTreeItemRowProps {
@@ -218,6 +240,35 @@ interface FolderTreeItemRowProps {
   onProjectSelect?: () => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
+  consumeClickSuppression?: ConsumeDragClickSuppression;
+  dragBindings?: SidebarSortableDragBindings;
+  manualSort?: ManualThreadTreeDndState;
+  sortableRef?: (element: HTMLDivElement | null) => void;
+  sortableStyle?: CSSProperties;
+}
+
+interface ManualThreadTreeDndState {
+  consumeClickSuppression: ConsumeDragClickSuppression;
+  dndContextProps: SidebarReorderDndContextProps;
+  enabled: boolean;
+  itemIdsByParentKey: ReadonlyMap<string, readonly string[]>;
+  onClickCapture: MouseEventHandler<HTMLElement>;
+}
+
+interface UseManualThreadTreeDndArgs {
+  containerId: string;
+  enabled: boolean;
+  rootItems: readonly ProjectThreadItem[];
+}
+
+type ManualSortableItemKind = "thread" | "folder" | "environment";
+
+interface ManualThreadTreeLookup {
+  folderPathByParentKey: Map<string, readonly string[]>;
+  itemIdsByParentKey: Map<string, string[]>;
+  itemKindById: Map<string, ManualSortableItemKind>;
+  parentKeyByItemId: Map<string, string>;
+  threadByItemId: Map<string, ThreadListEntry>;
 }
 
 // Render key + routing projectId for any item kind. Folders derive from their
@@ -245,6 +296,200 @@ export function getItemProjectId(item: ProjectThreadItem): string {
   }
 }
 
+function getManualSortableItemKind(
+  item: ProjectThreadItem,
+): ManualSortableItemKind {
+  return item.kind;
+}
+
+function collectManualThreadTreeLookup(
+  items: readonly ProjectThreadItem[],
+  containerId: string,
+): ManualThreadTreeLookup {
+  const lookup: ManualThreadTreeLookup = {
+    folderPathByParentKey: new Map([[containerId, []]]),
+    itemIdsByParentKey: new Map(),
+    itemKindById: new Map(),
+    parentKeyByItemId: new Map(),
+    threadByItemId: new Map(),
+  };
+
+  const walk = (
+    siblingItems: readonly ProjectThreadItem[],
+    parentKey: string,
+  ) => {
+    const itemIds = siblingItems.map(getManualOrderItemKey);
+    lookup.itemIdsByParentKey.set(parentKey, itemIds);
+
+    for (const item of siblingItems) {
+      const itemId = getManualOrderItemKey(item);
+      lookup.itemKindById.set(itemId, getManualSortableItemKind(item));
+      lookup.parentKeyByItemId.set(itemId, parentKey);
+
+      if (item.kind === "thread") {
+        lookup.threadByItemId.set(itemId, item.node.thread);
+      } else if (item.kind === "folder") {
+        lookup.folderPathByParentKey.set(item.group.key, item.group.path);
+        walk(item.group.items, item.group.key);
+      }
+    }
+  };
+
+  walk(items, containerId);
+  return lookup;
+}
+
+function moveIdBefore({
+  activeId,
+  itemIds,
+  overId,
+}: {
+  activeId: string;
+  itemIds: readonly string[];
+  overId: string | null;
+}): string[] {
+  const withoutActive = itemIds.filter((id) => id !== activeId);
+  const insertIndex =
+    overId === null ? withoutActive.length : withoutActive.indexOf(overId);
+  if (insertIndex === -1) {
+    return [...itemIds];
+  }
+  return [
+    ...withoutActive.slice(0, insertIndex),
+    activeId,
+    ...withoutActive.slice(insertIndex),
+  ];
+}
+
+function writeManualOrderLists(
+  current: SidebarManualOrder,
+  updates: ReadonlyMap<string, readonly string[]>,
+): SidebarManualOrder {
+  const next = { ...current };
+  for (const [parentKey, itemIds] of updates) {
+    next[parentKey] = [...itemIds];
+  }
+  return next;
+}
+
+function useManualThreadTreeDnd({
+  containerId,
+  enabled,
+  rootItems,
+}: UseManualThreadTreeDndArgs): ManualThreadTreeDndState | null {
+  const lookup = useMemo(
+    () => collectManualThreadTreeLookup(rootItems, containerId),
+    [containerId, rootItems],
+  );
+  const setManualOrder = useSetAtom(sidebarManualOrderAtom);
+  const updateThread = useUpdateThread();
+
+  const handleDragEnd = useCallback(
+    (event: DragEndEvent) => {
+      if (!enabled) return;
+
+      const { active, over } = event;
+      if (
+        !over ||
+        typeof active.id !== "string" ||
+        typeof over.id !== "string"
+      ) {
+        return;
+      }
+
+      const activeId = active.id;
+      const overId = over.id;
+      if (activeId === overId) return;
+
+      const activeKind = lookup.itemKindById.get(activeId);
+      const overKind = lookup.itemKindById.get(overId);
+      const fromParentKey = lookup.parentKeyByItemId.get(activeId);
+      let toParentKey = lookup.parentKeyByItemId.get(overId);
+      let destinationOverId: string | null = overId;
+
+      if (!activeKind || !overKind || !fromParentKey || !toParentKey) {
+        return;
+      }
+
+      // Dropping a thread on a folder header means "move into this folder".
+      if (activeKind === "thread" && overKind === "folder") {
+        toParentKey = overId;
+        destinationOverId = null;
+      }
+
+      // Folders can be reordered among siblings, but they are not folder
+      // entities and cannot be re-filed into other folders.
+      if (activeKind === "folder" && fromParentKey !== toParentKey) {
+        return;
+      }
+
+      const sourceIds = lookup.itemIdsByParentKey.get(fromParentKey);
+      const destinationIds = lookup.itemIdsByParentKey.get(toParentKey);
+      if (!sourceIds || !destinationIds) {
+        return;
+      }
+
+      const updates = new Map<string, readonly string[]>();
+      if (fromParentKey === toParentKey) {
+        updates.set(
+          fromParentKey,
+          moveIdBefore({
+            activeId,
+            itemIds: sourceIds,
+            overId: destinationOverId,
+          }),
+        );
+      } else {
+        updates.set(
+          fromParentKey,
+          sourceIds.filter((id) => id !== activeId),
+        );
+        updates.set(
+          toParentKey,
+          moveIdBefore({
+            activeId,
+            itemIds: destinationIds,
+            overId: destinationOverId,
+          }),
+        );
+      }
+
+      setManualOrder((current) => writeManualOrderLists(current, updates));
+
+      if (activeKind !== "thread" || fromParentKey === toParentKey) {
+        return;
+      }
+
+      const thread = lookup.threadByItemId.get(activeId);
+      if (!thread) return;
+
+      const destinationFolders =
+        lookup.folderPathByParentKey.get(toParentKey) ?? [];
+      const title = buildThreadTitleForFolderPath(
+        thread.title ?? getThreadDisplayTitle(thread),
+        destinationFolders,
+      );
+      updateThread.mutate({ id: activeId, title });
+    },
+    [enabled, lookup, setManualOrder, updateThread],
+  );
+
+  const { consumeClickSuppression, dndContextProps, onClickCapture } =
+    useSidebarReorderDnd({ onDragEnd: handleDragEnd });
+
+  if (!enabled) {
+    return null;
+  }
+
+  return {
+    consumeClickSuppression,
+    dndContextProps,
+    enabled,
+    itemIdsByParentKey: lookup.itemIdsByParentKey,
+    onClickCapture,
+  };
+}
+
 interface EnvironmentThreadGroupRowProps {
   projectId: string;
   environmentThreadGroup: EnvironmentThreadGroup;
@@ -419,6 +664,8 @@ function getThreadRowOptions({
   const baseOptions = {
     depth,
     isCompact: nodeDepth > 0 || isEnvGrouped,
+    ...(consumeClickSuppression ? { consumeClickSuppression } : {}),
+    ...(dragBindings ? { dragBindings } : {}),
   };
 
   if (!isParent) {
@@ -436,8 +683,6 @@ function getThreadRowOptions({
     childActivity,
     ...(stickyLevel !== undefined ? { stickyLevel } : {}),
     onToggleCollapsed: onToggleThreadCollapsed,
-    ...(consumeClickSuppression ? { consumeClickSuppression } : {}),
-    ...(dragBindings ? { dragBindings } : {}),
   };
 }
 
@@ -515,6 +760,57 @@ function ProjectThreadTreeGroup({
   );
 }
 
+function ManualSortableList({
+  children,
+  manualSort,
+  parentKey,
+}: {
+  children: ReactNode;
+  manualSort?: ManualThreadTreeDndState | null;
+  parentKey: string;
+}) {
+  if (!manualSort?.enabled) {
+    return <>{children}</>;
+  }
+
+  return (
+    <SortableContext
+      items={[...(manualSort.itemIdsByParentKey.get(parentKey) ?? [])]}
+      strategy={verticalListSortingStrategy}
+    >
+      {children}
+    </SortableContext>
+  );
+}
+
+const ManualSortableThreadTreeItemRow = memo(
+  function ManualSortableThreadTreeItemRow({
+    manualSort,
+    ...props
+  }: ThreadTreeItemRowProps) {
+    const itemId = getManualOrderItemKey(props.item);
+    const { dragBindings, setNodeRef, style } = useSidebarSortable({
+      id: itemId,
+      disabled: !manualSort?.enabled || props.item.kind === "environment",
+    });
+
+    if (!manualSort?.enabled || props.item.kind === "environment") {
+      return <ThreadTreeItemRow manualSort={manualSort} {...props} />;
+    }
+
+    return (
+      <ThreadTreeItemRow
+        {...props}
+        consumeClickSuppression={manualSort.consumeClickSuppression}
+        dragBindings={dragBindings}
+        manualSort={manualSort}
+        sortableRef={setNodeRef}
+        sortableStyle={style}
+      />
+    );
+  },
+);
+
 function useArchiveEnvironmentThreadGroupAction({
   environmentId,
   projectId,
@@ -942,6 +1238,11 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   onProjectSelect,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
+  consumeClickSuppression,
+  dragBindings,
+  manualSort,
+  sortableRef,
+  sortableStyle,
 }: ThreadTreeItemRowProps) {
   if (item.kind === "folder") {
     return (
@@ -955,6 +1256,11 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         onProjectSelect={onProjectSelect}
         onToggleThreadCollapsed={onToggleThreadCollapsed}
         onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+        consumeClickSuppression={consumeClickSuppression}
+        dragBindings={dragBindings}
+        manualSort={manualSort}
+        sortableRef={sortableRef}
+        sortableStyle={sortableStyle}
       />
     );
   }
@@ -974,6 +1280,10 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         onProjectSelect={onProjectSelect}
         onToggleThreadCollapsed={onToggleThreadCollapsed}
         onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+        consumeClickSuppression={consumeClickSuppression}
+        dragBindings={dragBindings}
+        sortableRef={sortableRef}
+        sortableStyle={sortableStyle}
       />
     );
   }
@@ -1009,6 +1319,11 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   onProjectSelect,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
+  consumeClickSuppression,
+  dragBindings,
+  manualSort,
+  sortableRef,
+  sortableStyle,
 }: FolderTreeItemRowProps) {
   const collapsedFolders = useAtomValue(sidebarCollapsedFoldersAtom);
   const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
@@ -1027,13 +1342,19 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
 
   return (
-    <SidebarStickyGroup className="space-y-0.5">
+    <SidebarStickyGroup
+      ref={sortableRef}
+      style={sortableStyle}
+      className="space-y-0.5"
+    >
       <SidebarFolderRow
         name={folder.name}
         pathLabel={formatFolderPathLabel(folder.path)}
         depth={headerDepth}
         threadCount={folder.threadCount}
         activity={folder.activity}
+        consumeClickSuppression={consumeClickSuppression}
+        dragBindings={dragBindings}
         isCollapsed={isCollapsed}
         onToggleCollapsed={handleToggleCollapsed}
         stickyLevel={stickyLevel}
@@ -1041,22 +1362,25 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
       {!isCollapsed ? (
         <div className="relative space-y-px">
           <ThreadTreeGroupLine parentRowDepth={headerDepth} />
-          {folder.items.map((item) => (
-            <ThreadTreeItemRow
-              key={getItemKey(item)}
-              projectId={getItemProjectId(item)}
-              item={item}
-              depthOffset={depthOffset + 1}
-              insideFolder
-              selectedThreadId={selectedThreadId}
-              collapsedThreadIds={collapsedThreadIds}
-              collapsedEnvironmentIds={collapsedEnvironmentIds}
-              variant={variant}
-              onProjectSelect={onProjectSelect}
-              onToggleThreadCollapsed={onToggleThreadCollapsed}
-              onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-            />
-          ))}
+          <ManualSortableList manualSort={manualSort} parentKey={folder.key}>
+            {folder.items.map((item) => (
+              <ManualSortableThreadTreeItemRow
+                key={getItemKey(item)}
+                projectId={getItemProjectId(item)}
+                item={item}
+                depthOffset={depthOffset + 1}
+                insideFolder
+                selectedThreadId={selectedThreadId}
+                collapsedThreadIds={collapsedThreadIds}
+                collapsedEnvironmentIds={collapsedEnvironmentIds}
+                variant={variant}
+                onProjectSelect={onProjectSelect}
+                onToggleThreadCollapsed={onToggleThreadCollapsed}
+                onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+                manualSort={manualSort}
+              />
+            ))}
+          </ManualSortableList>
         </div>
       ) : null}
     </SidebarStickyGroup>
@@ -1221,6 +1545,11 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
       projectId,
     ],
   );
+  const manualSort = useManualThreadTreeDnd({
+    containerId: projectId,
+    enabled: chronologicalSort === "none",
+    rootItems,
+  });
 
   if (threadListState.status === "loading") {
     return (
@@ -1258,25 +1587,37 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
     );
   }
 
-  return (
-    <ProjectThreadTreeGroup variant={variant}>
-      {rootItems.map((item) => (
-        <ThreadTreeItemRow
-          key={getItemKey(item)}
-          projectId={projectId}
-          item={item}
-          depthOffset={0}
-          selectedThreadId={selectedThreadId}
-          collapsedThreadIds={collapsedThreadIds}
-          collapsedEnvironmentIds={collapsedEnvironmentIds}
-          variant={variant}
-          onProjectSelect={onProjectSelect}
-          onToggleThreadCollapsed={onToggleThreadCollapsed}
-          onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-        />
-      ))}
+  const tree = (
+    <ProjectThreadTreeGroup
+      variant={variant}
+      onClickCapture={manualSort?.onClickCapture}
+    >
+      <ManualSortableList manualSort={manualSort} parentKey={projectId}>
+        {rootItems.map((item) => (
+          <ManualSortableThreadTreeItemRow
+            key={getItemKey(item)}
+            projectId={projectId}
+            item={item}
+            depthOffset={0}
+            selectedThreadId={selectedThreadId}
+            collapsedThreadIds={collapsedThreadIds}
+            collapsedEnvironmentIds={collapsedEnvironmentIds}
+            variant={variant}
+            onProjectSelect={onProjectSelect}
+            onToggleThreadCollapsed={onToggleThreadCollapsed}
+            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+            manualSort={manualSort ?? undefined}
+          />
+        ))}
+      </ManualSortableList>
     </ProjectThreadTreeGroup>
   );
+
+  return manualSort ? (
+    <DndContext {...manualSort.dndContextProps}>{tree}</DndContext>
+  ) : (
+    tree
+  );
 });
 
 // Flat "All Threads" bucket for chronological mode: one top-level row per
@@ -1310,6 +1651,11 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
       }),
     [chronologicalSort, threads, compareThreads, groupBy, manualOrder],
   );
+  const manualSort = useManualThreadTreeDnd({
+    containerId: CHRONOLOGICAL_CONTAINER_ID,
+    enabled: chronologicalSort === "none",
+    rootItems,
+  });
 
   if (threadListState.status === "loading") {
     return (
@@ -1337,25 +1683,40 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
     );
   }
 
-  return (
-    <ProjectThreadTreeGroup variant="section">
-      {rootItems.map((item) => (
-        <ThreadTreeItemRow
-          key={getItemKey(item)}
-          projectId={getItemProjectId(item)}
-          item={item}
-          depthOffset={0}
-          selectedThreadId={selectedThreadId}
-          collapsedThreadIds={collapsedThreadIds}
-          collapsedEnvironmentIds={collapsedEnvironmentIds}
-          variant="section"
-          onProjectSelect={onProjectSelect}
-          onToggleThreadCollapsed={onToggleThreadCollapsed}
-          onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-        />
-      ))}
+  const tree = (
+    <ProjectThreadTreeGroup
+      variant="section"
+      onClickCapture={manualSort?.onClickCapture}
+    >
+      <ManualSortableList
+        manualSort={manualSort}
+        parentKey={CHRONOLOGICAL_CONTAINER_ID}
+      >
+        {rootItems.map((item) => (
+          <ManualSortableThreadTreeItemRow
+            key={getItemKey(item)}
+            projectId={getItemProjectId(item)}
+            item={item}
+            depthOffset={0}
+            selectedThreadId={selectedThreadId}
+            collapsedThreadIds={collapsedThreadIds}
+            collapsedEnvironmentIds={collapsedEnvironmentIds}
+            variant="section"
+            onProjectSelect={onProjectSelect}
+            onToggleThreadCollapsed={onToggleThreadCollapsed}
+            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+            manualSort={manualSort ?? undefined}
+          />
+        ))}
+      </ManualSortableList>
     </ProjectThreadTreeGroup>
   );
+
+  return manualSort ? (
+    <DndContext {...manualSort.dndContextProps}>{tree}</DndContext>
+  ) : (
+    tree
+  );
 });
 
 function ProjectRowComponent({
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index cd2db655d..fdf9f135b 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -1,4 +1,9 @@
-import { memo, type CSSProperties } from "react";
+import {
+  memo,
+  useCallback,
+  type CSSProperties,
+  type MouseEventHandler,
+} from "react";
 import { Icon } from "@/components/ui/icon.js";
 import { SidebarStickyTier } from "@/components/ui/sidebar.js";
 import {
@@ -20,6 +25,8 @@ import {
 } from "./sidebarRowClasses";
 import { SidebarChildToggleChevron } from "./SidebarChildToggleChevron";
 import { ThreadStatusGlyph } from "./ThreadRow";
+import type { SidebarSortableDragBindings } from "./sortableMotion";
+import type { ConsumeDragClickSuppression } from "@/components/ui/use-drag-click-suppression";
 
 interface SidebarFolderRowProps {
   // Leaf segment shown on the header ("Q3").
@@ -35,6 +42,8 @@ interface SidebarFolderRowProps {
   onToggleCollapsed: () => void;
   // Pin depth among parent rows when sticky; absent = not pinned (past the cap).
   stickyLevel?: number;
+  consumeClickSuppression?: ConsumeDragClickSuppression;
+  dragBindings?: SidebarSortableDragBindings;
 }
 
 // The "Work › Q3 (2)" disclosure header for a derived folder. Not a thread:
@@ -47,6 +56,8 @@ function SidebarFolderRowComponent({
   depth,
   threadCount,
   activity,
+  consumeClickSuppression,
+  dragBindings,
   isCollapsed,
   onToggleCollapsed,
   stickyLevel,
@@ -64,10 +75,21 @@ function SidebarFolderRowComponent({
     SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
     COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
     "cursor-pointer",
+    dragBindings && !dragBindings.disabled && "select-none",
   );
   const style: CSSProperties = {
     paddingLeft: getSidebarThreadRowPaddingLeft(depth),
   };
+  const handleClickCapture = useCallback<MouseEventHandler<HTMLElement>>(
+    (event) => {
+      if (!consumeClickSuppression?.()) {
+        return;
+      }
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    [consumeClickSuppression],
+  );
   const content = (
     <>
       {/* Full-bleed toggle target for pointer users; the chevron owns keyboard
@@ -107,7 +129,10 @@ function SidebarFolderRowComponent({
         />
       </span>
       <span
-        className={cn("relative z-10 shrink-0", COARSE_POINTER_ROW_ACTION_SIZE_CLASS)}
+        className={cn(
+          "relative z-10 shrink-0",
+          COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+        )}
       >
         {showRollupGlyph ? (
           <span
@@ -131,11 +156,17 @@ function SidebarFolderRowComponent({
   if (stickyLevel !== undefined) {
     return (
       <SidebarStickyTier
+        ref={dragBindings?.setActivatorNodeRef}
         tier="parent"
         level={stickyLevel}
         className={className}
         style={style}
         title={pathLabel}
+        {...dragBindings?.attributes}
+        {...(dragBindings?.listeners ?? {})}
+        onClickCapture={
+          consumeClickSuppression ? handleClickCapture : undefined
+        }
       >
         {content}
       </SidebarStickyTier>
@@ -143,7 +174,15 @@ function SidebarFolderRowComponent({
   }
 
   return (
-    <div className={className} style={style} title={pathLabel}>
+    <div
+      ref={dragBindings?.setActivatorNodeRef}
+      className={className}
+      style={style}
+      title={pathLabel}
+      {...dragBindings?.attributes}
+      {...(dragBindings?.listeners ?? {})}
+      onClickCapture={consumeClickSuppression ? handleClickCapture : undefined}
+    >
       {content}
     </div>
   );
diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index 1c3beb1d6..fa2ddf667 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -54,6 +54,8 @@ import { SidebarChildToggleChevron } from "./SidebarChildToggleChevron";
 interface ThreadRowBaseOptions {
   depth: number;
   isCompact: boolean;
+  consumeClickSuppression?: ConsumeDragClickSuppression;
+  dragBindings?: SidebarSortableDragBindings;
 }
 
 export type ThreadRowOptions =
@@ -69,8 +71,6 @@ export type ThreadRowOptions =
       // (deeper than the sticky cap, or not a sticky parent role).
       stickyLevel?: number;
       onToggleCollapsed: (threadId: string) => void;
-      consumeClickSuppression?: ConsumeDragClickSuppression;
-      dragBindings?: SidebarSortableDragBindings;
     });
 
 interface ThreadRowProps {
@@ -143,7 +143,14 @@ function renderThreadRowContainer({
   }
 
   return (
-    <div className={className} style={style} onClickCapture={onClickCapture}>
+    <div
+      ref={dragBindings?.setActivatorNodeRef}
+      className={className}
+      style={style}
+      {...dragBindings?.attributes}
+      {...(dragBindings?.listeners ?? {})}
+      onClickCapture={onClickCapture}
+    >
       {children}
     </div>
   );
@@ -228,7 +235,10 @@ function ThreadTrailingIndicator({
 
   return (
     <span
-      className={cn(SIDEBAR_ROW_GLYPH_SLOT_CLASS, COARSE_POINTER_GLYPH_BOX_CLASS)}
+      className={cn(
+        SIDEBAR_ROW_GLYPH_SLOT_CLASS,
+        COARSE_POINTER_GLYPH_BOX_CLASS,
+      )}
     >
       <ThreadStatusGlyph
         hasPendingInteraction={hasPendingInteraction}
@@ -291,7 +301,7 @@ function ThreadRowComponent({
     ? `Open ${labelTitle} (unsubmitted draft)`
     : `Open ${labelTitle}`;
   const linkTitle = linkLabel;
-  const parentDragBindings = parentOptions?.dragBindings;
+  const rowDragBindings = options.dragBindings;
   const rowClassName = cn(
     SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
     "group/thread-row",
@@ -303,19 +313,19 @@ function ThreadRowComponent({
     showActive
       ? SIDEBAR_ROW_SELECTED_STATE_CLASS
       : SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
-    parentDragBindings && !parentDragBindings.disabled && "select-none",
+    rowDragBindings && !rowDragBindings.disabled && "select-none",
   );
   const rowStyle = getThreadRowStyle(options.depth);
   const isActionsOpen = isDropdownActionsOpen || isContextActionsOpen;
-  const handleParentClickCapture = useCallback<ThreadRowClickCaptureHandler>(
+  const handleRowClickCapture = useCallback<ThreadRowClickCaptureHandler>(
     (event) => {
-      if (!parentOptions?.consumeClickSuppression?.()) {
+      if (!options.consumeClickSuppression?.()) {
         return;
       }
       event.preventDefault();
       event.stopPropagation();
     },
-    [parentOptions],
+    [options],
   );
 
   const rowContent = (
@@ -397,8 +407,10 @@ function ThreadRowComponent({
   const row = renderThreadRowContainer({
     children: rowContent,
     className: rowClassName,
-    dragBindings: parentDragBindings,
-    onClickCapture: parentOptions ? handleParentClickCapture : undefined,
+    dragBindings: rowDragBindings,
+    onClickCapture: options.consumeClickSuppression
+      ? handleRowClickCapture
+      : undefined,
     stickyLevel: parentOptions?.stickyLevel,
     style: rowStyle,
   });
diff --git a/apps/app/src/components/sidebar/folderPath.test.ts b/apps/app/src/components/sidebar/folderPath.test.ts
index 5f7f23956..83ae5b5cf 100644
--- a/apps/app/src/components/sidebar/folderPath.test.ts
+++ b/apps/app/src/components/sidebar/folderPath.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   buildFolderKey,
+  buildThreadTitleForFolderPath,
   folderAncestorKeys,
   normalizeThreadTitle,
   parseThreadFolderPath,
@@ -92,9 +93,7 @@ describe("titleCreatesFolder", () => {
 
 describe("buildFolderKey", () => {
   it("namespaces a folder path by its container id", () => {
-    expect(buildFolderKey("proj_bb", ["Work", "Q3"])).toBe(
-      "proj_bb::Work/Q3",
-    );
+    expect(buildFolderKey("proj_bb", ["Work", "Q3"])).toBe("proj_bb::Work/Q3");
   });
 
   it("keeps same-named folders in different containers distinct", () => {
@@ -111,6 +110,24 @@ describe("buildFolderKey", () => {
   });
 });
 
+describe("buildThreadTitleForFolderPath", () => {
+  it("keeps the leaf and rewrites the folder prefix", () => {
+    expect(buildThreadTitleForFolderPath("Work/Q3/Plan", ["Personal"])).toBe(
+      "Personal/Plan",
+    );
+  });
+
+  it("strips the folder prefix for a top-level destination", () => {
+    expect(buildThreadTitleForFolderPath("Work/Q3/Plan", [])).toBe("Plan");
+  });
+
+  it("normalizes destination segments", () => {
+    expect(
+      buildThreadTitleForFolderPath(" Work / Q3 / Plan ", [" Personal "]),
+    ).toBe("Personal/Plan");
+  });
+});
+
 describe("folderAncestorKeys", () => {
   it("returns every ancestor folder key, outermost first", () => {
     expect(folderAncestorKeys("proj_1", "Work/Q3/Plan")).toEqual([
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
index be133dbe2..83c6c367b 100644
--- a/apps/app/src/components/sidebar/folderPath.ts
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -77,6 +77,16 @@ export function formatFolderPathLabel(segments: readonly string[]): string {
   return segments.join(FOLDER_PATH_SEPARATOR);
 }
 
+// Re-file a thread into a destination folder path while keeping its current
+// leaf. An empty destination strips the folder prefix and returns just the leaf.
+export function buildThreadTitleForFolderPath(
+  title: string,
+  destinationFolders: readonly string[],
+): string {
+  const { leaf } = parseThreadFolderPath(title);
+  return normalizeThreadTitle([...destinationFolders, leaf].join("/"));
+}
+
 // Stable identity for a folder within a section. `containerId` is the owner of
 // the section — a `proj_*` id for project sections, or a fixed sentinel for the
 // global sections — so "Work" in project A never collides with "Work" in

From 0a75e06a460f9324b4ca98d06cbf6bdcb304931c Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 21:10:05 -0700
Subject: [PATCH 06/54] Add sidebar folder Ladle stories (S7)

---
 .../FolderOnboardingDialog.stories.tsx        |  53 ++++
 .../sidebar/FolderGrouping.stories.tsx        | 254 ++++++++++++++++++
 .../src/components/sidebar/ProjectList.tsx    |   2 +-
 .../sidebar/SidebarFolderRow.stories.tsx      | 115 ++++++++
 .../SidebarViewOptionsMenu.stories.tsx        |  48 ++++
 5 files changed, 471 insertions(+), 1 deletion(-)
 create mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
 create mode 100644 apps/app/src/components/sidebar/FolderGrouping.stories.tsx
 create mode 100644 apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
 create mode 100644 apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx

diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
new file mode 100644
index 000000000..dc588739f
--- /dev/null
+++ b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
@@ -0,0 +1,53 @@
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { DialogStage } from "../../../.ladle/story-dialog-stage";
+import { FolderOnboardingDialogContent } from "./FolderOnboardingDialog";
+
+export default {
+  title: "dialogs/Folder onboarding",
+};
+
+const noop = () => {};
+
+function OnboardingStory({
+  pathLabel,
+  pending = false,
+  showGroupingHint = true,
+}: {
+  pathLabel: string;
+  pending?: boolean;
+  showGroupingHint?: boolean;
+}) {
+  return (
+    <DialogStage>
+      <FolderOnboardingDialogContent
+        pathLabel={pathLabel}
+        showGroupingHint={showGroupingHint}
+        pending={pending}
+        onConfirm={noop}
+        onCancel={noop}
+      />
+    </DialogStage>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow label="default" hint="first folder creation, grouping off">
+        <OnboardingStory pathLabel="Work / Q3 / Planning" />
+      </StoryRow>
+      <StoryRow label="grouping already on" hint="no auto-enable hint">
+        <OnboardingStory
+          pathLabel="Clients / Acme / Onboarding"
+          showGroupingHint={false}
+        />
+      </StoryRow>
+      <StoryRow label="long path" hint="preview wraps in the dialog body">
+        <OnboardingStory pathLabel="Customers / Enterprise rollout / Migration planning / Cutover checklist" />
+      </StoryRow>
+      <StoryRow label="pending" hint="buttons disabled while rename submits">
+        <OnboardingStory pathLabel="Work / Q4 / Roadmap" pending />
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/sidebar/FolderGrouping.stories.tsx b/apps/app/src/components/sidebar/FolderGrouping.stories.tsx
new file mode 100644
index 000000000..a02597678
--- /dev/null
+++ b/apps/app/src/components/sidebar/FolderGrouping.stories.tsx
@@ -0,0 +1,254 @@
+import { useMemo, type ReactNode } from "react";
+import { createStore, Provider as JotaiProvider } from "jotai";
+import type { ThreadListEntry } from "@bb/domain";
+import {
+  PROJECT_IDS,
+  makeThreadListEntry,
+} from "../../../.ladle/story-fixtures";
+import { ProjectActionsProvider } from "@/components/project/ProjectActionsProvider";
+import { ThreadActionsProvider } from "@/components/thread/ThreadActionsProvider";
+import { SidebarStickyStack } from "@/components/ui/sidebar.js";
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import {
+  ChronologicalThreadTree,
+  ProjectThreadTree,
+  type ProjectThreadListState,
+} from "./ProjectRow";
+import { compareStandardThreads } from "./projectThreadGroups";
+import {
+  sidebarChronologicalSortAtom,
+  sidebarGroupByAtom,
+  sidebarManualOrderAtom,
+  type SidebarChronologicalSort,
+  type SidebarGroupBy,
+  type SidebarManualOrder,
+} from "./sidebarCollapsedAtoms";
+
+export default {
+  title: "sidebar/Folder grouping",
+};
+
+const noop = () => {};
+const PROJECT_ID = PROJECT_IDS.bb;
+
+function makeThread(overrides: Partial<ThreadListEntry>): ThreadListEntry {
+  return makeThreadListEntry({
+    projectId: PROJECT_ID,
+    titleFallback: overrides.title ?? "Story thread",
+    ...overrides,
+  });
+}
+
+const folderThreads: ThreadListEntry[] = [
+  makeThread({
+    id: "thr_work_plan",
+    title: "Work/Q3/Plan",
+    latestAttentionAt: 90,
+    createdAt: 90,
+  }),
+  makeThread({
+    id: "thr_work_notes",
+    title: "Work/Q3/Notes",
+    latestAttentionAt: 80,
+    createdAt: 80,
+  }),
+  makeThread({
+    id: "thr_work_parent",
+    title: "Work/Q4/Kickoff",
+    latestAttentionAt: 70,
+    createdAt: 70,
+  }),
+  makeThread({
+    id: "thr_work_child",
+    parentThreadId: "thr_work_parent",
+    title: "Ignored/Child/Path",
+    latestAttentionAt: 65,
+    createdAt: 65,
+  }),
+  makeThread({
+    id: "thr_personal_plan",
+    title: "Personal/Q3/Plan",
+    latestAttentionAt: 60,
+    createdAt: 60,
+  }),
+  makeThread({
+    id: "thr_standalone",
+    title: "Standalone follow-up",
+    latestAttentionAt: 50,
+    createdAt: 50,
+  }),
+  makeThread({
+    id: "thr_env_a",
+    title: "Work/Build/Daemon",
+    environmentId: "env_story_folder",
+    environmentName: "Folder build",
+    environmentBranchName: "bb/sidebar-folders",
+    environmentWorkspaceDisplayKind: "managed-worktree",
+    latestAttentionAt: 40,
+    createdAt: 40,
+  }),
+  makeThread({
+    id: "thr_env_b",
+    title: "Work/Build/Stories",
+    environmentId: "env_story_folder",
+    environmentName: "Folder build",
+    environmentBranchName: "bb/sidebar-folders",
+    environmentWorkspaceDisplayKind: "managed-worktree",
+    hasPendingInteraction: true,
+    latestAttentionAt: 30,
+    createdAt: 30,
+  }),
+];
+
+const manualThreads: ThreadListEntry[] = [
+  makeThread({ id: "thr_a", title: "Work/Q3/Plan", latestAttentionAt: 90 }),
+  makeThread({ id: "thr_b", title: "Work/Q3/Notes", latestAttentionAt: 80 }),
+  makeThread({ id: "thr_c", title: "Work/Q4/Kickoff", latestAttentionAt: 70 }),
+  makeThread({ id: "thr_d", title: "Personal/Plan", latestAttentionAt: 60 }),
+  makeThread({ id: "thr_e", title: "Loose thread", latestAttentionAt: 50 }),
+];
+
+const manualOrder: SidebarManualOrder = {
+  [PROJECT_ID]: ["thr_e", `${PROJECT_ID}::Personal`, `${PROJECT_ID}::Work`],
+  [`${PROJECT_ID}::Work`]: [`${PROJECT_ID}::Work/Q4`, `${PROJECT_ID}::Work/Q3`],
+  [`${PROJECT_ID}::Work/Q3`]: ["thr_b", "thr_a"],
+};
+
+function SidebarState({
+  children,
+  groupBy,
+  manualOrder,
+  sort = "updated",
+}: {
+  children: ReactNode;
+  groupBy: SidebarGroupBy;
+  manualOrder?: SidebarManualOrder;
+  sort?: SidebarChronologicalSort;
+}) {
+  const store = useMemo(() => {
+    const next = createStore();
+    next.set(sidebarGroupByAtom, groupBy);
+    next.set(sidebarChronologicalSortAtom, sort);
+    if (manualOrder) {
+      next.set(sidebarManualOrderAtom, manualOrder);
+    }
+    return next;
+  }, [groupBy, manualOrder, sort]);
+
+  return <JotaiProvider store={store}>{children}</JotaiProvider>;
+}
+
+function SidebarStage({
+  children,
+  groupBy,
+  manualOrder,
+  sort,
+}: {
+  children: ReactNode;
+  groupBy: SidebarGroupBy;
+  manualOrder?: SidebarManualOrder;
+  sort?: SidebarChronologicalSort;
+}) {
+  return (
+    <SidebarState groupBy={groupBy} sort={sort} manualOrder={manualOrder}>
+      <ProjectActionsProvider>
+        <ThreadActionsProvider>
+          <div className="w-full max-w-[460px] min-w-0 rounded-md bg-sidebar p-2 text-sidebar-foreground">
+            <SidebarStickyStack>{children}</SidebarStickyStack>
+          </div>
+        </ThreadActionsProvider>
+      </ProjectActionsProvider>
+    </SidebarState>
+  );
+}
+
+function projectTree(
+  threads: readonly ThreadListEntry[],
+): ProjectThreadListState {
+  return { status: "ready", threads: [...threads] };
+}
+
+function ProjectTree({ threads }: { threads: readonly ThreadListEntry[] }) {
+  return (
+    <ProjectThreadTree
+      projectId={PROJECT_ID}
+      threadListState={projectTree(threads)}
+      compareThreads={compareStandardThreads}
+      collapsedThreadIds={new Set()}
+      collapsedEnvironmentIds={new Set()}
+      variant="section"
+      onToggleThreadCollapsed={noop}
+      onToggleEnvironmentCollapsed={noop}
+    />
+  );
+}
+
+export function NoneVsFolder() {
+  return (
+    <StoryCard columns={["None", "Folder"]} labelWidth="160px">
+      <StoryRow label="same data">
+        <SidebarStage groupBy="none">
+          <ProjectTree threads={folderThreads} />
+        </SidebarStage>
+        <SidebarStage groupBy="folder">
+          <ProjectTree threads={folderThreads} />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
+
+export function ChronologicalFolders() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="all threads"
+        hint="folder grouping in chronological mode"
+      >
+        <SidebarStage groupBy="folder">
+          <ChronologicalThreadTree
+            threadListState={projectTree(folderThreads)}
+            compareThreads={compareStandardThreads}
+            collapsedThreadIds={new Set()}
+            collapsedEnvironmentIds={new Set()}
+            onToggleThreadCollapsed={noop}
+            onToggleEnvironmentCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
+
+export function ManualOrder() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="Sort: None"
+        hint="manual list interleaves loose threads and folders"
+      >
+        <SidebarStage groupBy="folder" sort="none" manualOrder={manualOrder}>
+          <ProjectTree threads={manualThreads} />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
+
+export function CrossFolderRefile() {
+  const afterThreads = manualThreads.map((thread) =>
+    thread.id === "thr_a" ? { ...thread, title: "Personal/Plan" } : thread,
+  );
+  return (
+    <StoryCard columns={["Before", "After"]} labelWidth="160px">
+      <StoryRow label="drop into Personal">
+        <SidebarStage groupBy="folder" sort="none">
+          <ProjectTree threads={manualThreads} />
+        </SidebarStage>
+        <SidebarStage groupBy="folder" sort="none">
+          <ProjectTree threads={afterThreads} />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 7da10463e..035645aa0 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -499,7 +499,7 @@ function SidebarOrganizeMenuOption({
 // Shared display menu rendered on both the Projects and Threads section
 // headers. The organization mode is global, so either header's menu drives the
 // whole sidebar.
-function SidebarViewOptionsMenu({
+export function SidebarViewOptionsMenu({
   open,
   onOpenChange,
   onOrganizationModeSelect,
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
new file mode 100644
index 000000000..b44e068f9
--- /dev/null
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
@@ -0,0 +1,115 @@
+import type { ReactNode } from "react";
+import { SidebarStickyStack } from "@/components/ui/sidebar.js";
+import {
+  NO_COLLAPSED_CHILD_ACTIVITY,
+  type CollapsedChildActivity,
+} from "@/lib/thread-activity";
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { SidebarFolderRow } from "./SidebarFolderRow";
+
+export default {
+  title: "sidebar/Folder row",
+};
+
+const noop = () => {};
+
+function activity(
+  overrides: Partial<CollapsedChildActivity> = {},
+): CollapsedChildActivity {
+  return { ...NO_COLLAPSED_CHILD_ACTIVITY, ...overrides };
+}
+
+function SidebarStage({ children }: { children: ReactNode }) {
+  return (
+    <div className="w-full max-w-[460px] min-w-0 rounded-md bg-sidebar p-2 text-sidebar-foreground">
+      <SidebarStickyStack>
+        <div className="space-y-0.5">{children}</div>
+      </SidebarStickyStack>
+    </div>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow label="expanded" hint="folder header, no rolled-up status">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Work"
+            pathLabel="Work"
+            depth={0}
+            threadCount={3}
+            activity={activity()}
+            isCollapsed={false}
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow label="collapsed unread" hint="collapsed folders show activity">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Q3"
+            pathLabel="Work / Q3"
+            depth={1}
+            threadCount={2}
+            activity={activity({ unread: true })}
+            isCollapsed
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow label="collapsed working" hint="busy descendant rolls up">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Build"
+            pathLabel="Work / Build"
+            depth={2}
+            threadCount={4}
+            activity={activity({ working: true })}
+            isCollapsed
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow label="pending" hint="pending descendant wins the rollup">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Reviews"
+            pathLabel="Work / Reviews"
+            depth={3}
+            threadCount={6}
+            activity={activity({ pending: true, unread: true })}
+            isCollapsed
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow label="long name" hint="header truncates inside sidebar width">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Very long customer migration and rollout folder"
+            pathLabel="Clients / Very long customer migration and rollout folder"
+            depth={1}
+            threadCount={12}
+            activity={activity()}
+            isCollapsed={false}
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow label="beyond sticky cap" hint="deep folders render non-sticky">
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Fifth level"
+            pathLabel="A / B / C / D / Fifth level"
+            depth={5}
+            threadCount={1}
+            activity={activity()}
+            isCollapsed={false}
+            onToggleCollapsed={noop}
+          />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
new file mode 100644
index 000000000..dd38ab475
--- /dev/null
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -0,0 +1,48 @@
+import { useMemo } from "react";
+import { createStore, Provider as JotaiProvider } from "jotai";
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { SidebarViewOptionsMenu } from "./ProjectList";
+import {
+  sidebarChronologicalSortAtom,
+  sidebarGroupByAtom,
+} from "./sidebarCollapsedAtoms";
+
+export default {
+  title: "sidebar/View options menu",
+};
+
+function MenuStory({
+  groupBy,
+  sort,
+}: {
+  groupBy: "none" | "folder";
+  sort: "updated" | "created" | "none";
+}) {
+  const store = useMemo(() => {
+    const next = createStore();
+    next.set(sidebarChronologicalSortAtom, sort);
+    next.set(sidebarGroupByAtom, groupBy);
+    return next;
+  }, [groupBy, sort]);
+
+  return (
+    <JotaiProvider store={store}>
+      <div className="relative flex h-72 w-80 items-start justify-end rounded-md bg-sidebar p-4 text-sidebar-foreground">
+        <SidebarViewOptionsMenu open />
+      </div>
+    </JotaiProvider>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow label="default" hint="Updated at + Group by None">
+        <MenuStory sort="updated" groupBy="none" />
+      </StoryRow>
+      <StoryRow label="manual folders" hint="Sort by None + Group by Folder">
+        <MenuStory sort="none" groupBy="folder" />
+      </StoryRow>
+    </StoryCard>
+  );
+}

From 9a9f3a66187337972c6a4a1573102f944f28ae30 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 21:38:56 -0700
Subject: [PATCH 07/54] Keep rename modal unchanged for folder grouping

---
 .../FolderOnboardingDialog.stories.tsx        |  53 -------
 .../dialogs/FolderOnboardingDialog.tsx        | 110 -------------
 .../dialogs/ThreadRenameDialog.stories.tsx    | 111 ++++++++-----
 .../components/dialogs/ThreadRenameDialog.tsx |  95 +++++------
 .../src/components/sidebar/ProjectList.tsx    |  23 ++-
 .../SidebarViewOptionsMenu.stories.tsx        |  14 +-
 .../sidebar/sidebarCollapsedAtoms.ts          |  10 --
 .../thread/ThreadActionsProvider.tsx          | 147 ++----------------
 8 files changed, 153 insertions(+), 410 deletions(-)
 delete mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
 delete mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.tsx

diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
deleted file mode 100644
index dc588739f..000000000
--- a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { StoryCard, StoryRow } from "../../../.ladle/story-card";
-import { DialogStage } from "../../../.ladle/story-dialog-stage";
-import { FolderOnboardingDialogContent } from "./FolderOnboardingDialog";
-
-export default {
-  title: "dialogs/Folder onboarding",
-};
-
-const noop = () => {};
-
-function OnboardingStory({
-  pathLabel,
-  pending = false,
-  showGroupingHint = true,
-}: {
-  pathLabel: string;
-  pending?: boolean;
-  showGroupingHint?: boolean;
-}) {
-  return (
-    <DialogStage>
-      <FolderOnboardingDialogContent
-        pathLabel={pathLabel}
-        showGroupingHint={showGroupingHint}
-        pending={pending}
-        onConfirm={noop}
-        onCancel={noop}
-      />
-    </DialogStage>
-  );
-}
-
-export function Overview() {
-  return (
-    <StoryCard>
-      <StoryRow label="default" hint="first folder creation, grouping off">
-        <OnboardingStory pathLabel="Work / Q3 / Planning" />
-      </StoryRow>
-      <StoryRow label="grouping already on" hint="no auto-enable hint">
-        <OnboardingStory
-          pathLabel="Clients / Acme / Onboarding"
-          showGroupingHint={false}
-        />
-      </StoryRow>
-      <StoryRow label="long path" hint="preview wraps in the dialog body">
-        <OnboardingStory pathLabel="Customers / Enterprise rollout / Migration planning / Cutover checklist" />
-      </StoryRow>
-      <StoryRow label="pending" hint="buttons disabled while rename submits">
-        <OnboardingStory pathLabel="Work / Q4 / Roadmap" pending />
-      </StoryRow>
-    </StoryCard>
-  );
-}
diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
deleted file mode 100644
index 1df41f0d4..000000000
--- a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Button } from "@/components/ui/button.js";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog.js";
-
-interface FolderOnboardingDialogContentProps {
-  // The user's entry previewed as breadcrumbs ("Work › Q3 › Planning").
-  pathLabel: string;
-  // Only shown when grouping is currently off, since accepting turns it on.
-  showGroupingHint: boolean;
-  pending: boolean;
-  onConfirm: () => void;
-  onCancel: () => void;
-}
-
-/**
- * Body of the first-folder confirmation: explains that "/" files a thread into
- * a folder, previews the resulting path, and offers Create / Cancel. Split from
- * the modal shell so stories can render it without the overlay (mirrors
- * {@link ConfirmDeleteDialogContent}).
- */
-export function FolderOnboardingDialogContent({
-  pathLabel,
-  showGroupingHint,
-  pending,
-  onConfirm,
-  onCancel,
-}: FolderOnboardingDialogContentProps) {
-  return (
-    <>
-      <DialogHeader>
-        <DialogTitle>Organize threads into folders</DialogTitle>
-        <DialogDescription>
-          Using “/” groups this thread into a folder:
-        </DialogDescription>
-      </DialogHeader>
-      <div className="space-y-2 text-sm">
-        <div className="rounded-md bg-muted px-3 py-2 font-medium break-words">
-          {pathLabel}
-        </div>
-        {showGroupingHint ? (
-          <p className="text-muted-foreground">
-            Folder grouping will turn on so you can see it.
-          </p>
-        ) : null}
-      </div>
-      <DialogFooter>
-        <Button
-          type="button"
-          variant="outline"
-          disabled={pending}
-          onClick={onCancel}
-        >
-          Cancel
-        </Button>
-        <Button type="button" disabled={pending} onClick={onConfirm}>
-          Create folder
-        </Button>
-      </DialogFooter>
-    </>
-  );
-}
-
-interface FolderOnboardingDialogProps {
-  open: boolean;
-  pathLabel: string;
-  showGroupingHint: boolean;
-  pending: boolean;
-  onConfirm: () => void;
-  onCancel: () => void;
-  // Esc / overlay dismiss routes back through cancel (reopen rename).
-  onOpenChange: (open: boolean) => void;
-}
-
-/**
- * First-folder confirmation modal, shown the first time a rename would create a
- * folder. Accepting submits the rename and enables folder grouping; declining
- * (button, Esc, or overlay) hands control back to the rename dialog with the
- * draft intact.
- */
-export function FolderOnboardingDialog({
-  open,
-  pathLabel,
-  showGroupingHint,
-  pending,
-  onConfirm,
-  onCancel,
-  onOpenChange,
-}: FolderOnboardingDialogProps) {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        {open ? (
-          <FolderOnboardingDialogContent
-            pathLabel={pathLabel}
-            showGroupingHint={showGroupingHint}
-            pending={pending}
-            onConfirm={onConfirm}
-            onCancel={onCancel}
-          />
-        ) : null}
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
index 95c81a703..558998bb4 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
@@ -1,5 +1,8 @@
 import { useRef } from "react";
-import { ThreadRenameDialogContent } from "./ThreadRenameDialog";
+import {
+  ThreadRenameDialogContent,
+  type ThreadRenameDialogTarget,
+} from "./ThreadRenameDialog";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import { DialogStage } from "../../../.ladle/story-dialog-stage";
 
@@ -9,65 +12,87 @@ export default {
 
 const noop = () => {};
 
-function RenameStory({
-  draft,
-  validationMessage = null,
-  pending = false,
-}: {
-  draft: string;
-  validationMessage?: string | null;
-  pending?: boolean;
-}) {
-  const inputRef = useRef<HTMLInputElement | null>(null);
-  return (
-    <DialogStage>
-      <ThreadRenameDialogContent
-        draft={draft}
-        validationMessage={validationMessage}
-        pending={pending}
-        onDraftChange={noop}
-        onSubmit={noop}
-        inputRef={inputRef}
-      />
-    </DialogStage>
-  );
-}
+const defaultTarget: ThreadRenameDialogTarget = {
+  id: "thr_demo",
+  currentTitle: "Audit recurring permission failures",
+};
+
+const parentTarget: ThreadRenameDialogTarget = {
+  id: "thr_parent",
+  currentTitle: "Frontend Parent",
+};
+
+const longTitleTarget: ThreadRenameDialogTarget = {
+  id: "thr_long",
+  currentTitle:
+    "Investigate slow tests on recurring CI failures after the timeline pagination v2 merge",
+};
 
 export function Overview() {
+  const inputRef = useRef<HTMLInputElement | null>(null);
   return (
     <StoryCard>
-      <StoryRow label="default" hint="single segment — preview reads “No folder”">
-        <RenameStory draft="Audit recurring permission failures" />
+      <StoryRow label="default" hint="thread, idle">
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={defaultTarget}
+            pending={false}
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
       </StoryRow>
       <StoryRow
-        label="folder preview"
-        hint="“/” reveals the folder + leaf beneath the input"
+        label="parent thread"
+        hint="parent threads use the same rename dialog copy"
       >
-        <RenameStory draft="Work/Q3/Planning" />
-      </StoryRow>
-      <StoryRow
-        label="normalization (trailing/doubled slash)"
-        hint="preview reflects the normalized path, not the raw text"
-      >
-        <RenameStory draft="/Work//Q3/Planning/" />
-      </StoryRow>
-      <StoryRow
-        label="empty after normalize"
-        hint="all-slashes draft submits to an empty-name validation error"
-      >
-        <RenameStory draft="///" validationMessage="Thread name cannot be empty." />
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={parentTarget}
+            pending={false}
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
       </StoryRow>
       <StoryRow
         label="pending"
         hint="submit in flight — input and submit are disabled"
       >
-        <RenameStory draft="Audit recurring permission failures" pending />
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={defaultTarget}
+            pending
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
       </StoryRow>
       <StoryRow
         label="long title"
         hint="input overflows horizontally inside the dialog frame"
       >
-        <RenameStory draft="Investigate slow tests on recurring CI failures after the timeline pagination v2 merge" />
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={longTitleTarget}
+            pending={false}
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
+      </StoryRow>
+      <StoryRow
+        label="empty input"
+        hint="clear the field and submit to see the validation message"
+      >
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={{ id: "thr_blank", currentTitle: "" }}
+            pending={false}
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
       </StoryRow>
     </StoryCard>
   );
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
index e074ba0c5..d45e3e2d5 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
@@ -1,44 +1,28 @@
-import { useId, type FormEvent, type RefObject } from "react";
+import { capitalize } from "@bb/thread-view";
+import { useId, useState, type FormEvent, type RefObject } from "react";
 import { Button } from "@/components/ui/button.js";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog.js";
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog.js";
 import { Input } from "@/components/ui/input.js";
-import {
-  formatFolderPathLabel,
-  parseThreadFolderPath,
-} from "@/components/sidebar/folderPath";
+import { useNameValidation } from "./useNameValidation.js";
 import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
 
 export interface ThreadRenameDialogTarget {
   id: string;
+  currentTitle: string;
 }
 
 interface ThreadRenameDialogProps {
   target: ThreadRenameDialogTarget | null;
-  // The draft is lifted into the provider so it survives a rename → first-folder
-  // modal → rename round trip; the dialog renders it as a controlled input.
-  draft: string;
-  validationMessage: string | null;
   pending?: boolean;
-  onDraftChange: (value: string) => void;
-  onSubmit: () => void;
   onOpenChange: (open: boolean) => void;
+  onRename: (threadId: string, title: string) => void;
 }
 
 export function ThreadRenameDialog({
   target,
-  draft,
-  validationMessage,
   pending = false,
-  onDraftChange,
-  onSubmit,
   onOpenChange,
+  onRename,
 }: ThreadRenameDialogProps) {
   const { inputRef, handleOpenAutoFocus } = useRenameDialogAutoFocus();
   return (
@@ -46,11 +30,10 @@ export function ThreadRenameDialog({
       <DialogContent onOpenAutoFocus={handleOpenAutoFocus}>
         {target ? (
           <ThreadRenameDialogContent
-            draft={draft}
-            validationMessage={validationMessage}
+            key={target.id}
+            target={target}
             pending={pending}
-            onDraftChange={onDraftChange}
-            onSubmit={onSubmit}
+            onRename={onRename}
             inputRef={inputRef}
           />
         ) : null}
@@ -60,74 +43,66 @@ export function ThreadRenameDialog({
 }
 
 export interface ThreadRenameDialogContentProps {
-  draft: string;
-  validationMessage: string | null;
+  target: ThreadRenameDialogTarget;
   pending: boolean;
-  onDraftChange: (value: string) => void;
-  onSubmit: () => void;
+  onRename: (threadId: string, title: string) => void;
   inputRef: RefObject<HTMLInputElement | null>;
 }
 
-// Reveals the folder the row normally hides: parses the current draft and shows
-// the resulting folder ancestors + leaf, or "No folder" for a single segment.
-function RenameFolderPreview({ draft }: { draft: string }) {
-  const { folders, leaf } = parseThreadFolderPath(draft);
-  if (folders.length === 0) {
-    return <p className="text-sm text-muted-foreground">No folder</p>;
-  }
-  return (
-    <p className="text-sm text-muted-foreground">
-      Folder:{" "}
-      <span className="text-foreground">{formatFolderPathLabel(folders)}</span>
-      {" · "}
-      Thread: <span className="text-foreground">{leaf}</span>
-    </p>
-  );
-}
-
 export function ThreadRenameDialogContent({
-  draft,
-  validationMessage,
+  target,
   pending,
-  onDraftChange,
-  onSubmit,
+  onRename,
   inputRef,
 }: ThreadRenameDialogContentProps) {
   const inputId = useId();
+  const [nextTitle, setNextTitle] = useState(target.currentTitle);
+  const label = "thread";
+  const { validationMessage, validate, clearMessage } = useNameValidation({
+    emptyMessage: `${capitalize(label)} name cannot be empty.`,
+  });
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     if (pending) return;
-    onSubmit();
+
+    const trimmedTitle = validate(nextTitle);
+    if (trimmedTitle === null) return;
+
+    onRename(target.id, trimmedTitle);
   };
 
   return (
     <>
       <DialogHeader>
-        <DialogTitle>Rename thread</DialogTitle>
-        <DialogDescription>Choose a new name for this thread.</DialogDescription>
+        <DialogTitle>Rename {label}</DialogTitle>
+        <DialogDescription>
+          Choose a new name for this {label}.
+        </DialogDescription>
       </DialogHeader>
       <form className="space-y-4" onSubmit={handleSubmit}>
         <div className="space-y-2">
           <Input
             ref={inputRef}
             id={inputId}
-            aria-label="Thread name"
-            value={draft}
+            aria-label={`${capitalize(label)} name`}
+            value={nextTitle}
             autoCapitalize="sentences"
             autoCorrect="off"
             spellCheck={false}
             disabled={pending}
-            onChange={(event) => onDraftChange(event.target.value)}
+            onChange={(event) => {
+              setNextTitle(event.target.value);
+              clearMessage();
+            }}
           />
-          <RenameFolderPreview draft={draft} />
           {validationMessage ? (
             <p className="text-sm text-destructive">{validationMessage}</p>
           ) : null}
         </div>
         <DialogFooter>
           <Button type="submit" disabled={pending}>
-            Rename thread
+            Rename {label}
           </Button>
         </DialogFooter>
       </form>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 035645aa0..f380325e4 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -70,6 +70,7 @@ import type { ProjectThreadListState } from "./ProjectRow";
 import {
   compareByCreatedAtDescending,
   compareStandardThreads,
+  isSidebarProjectThread,
   type ThreadComparator,
 } from "./projectThreadGroups";
 import {
@@ -97,7 +98,7 @@ import {
   type SidebarOrganizationMode,
   type SidebarSectionId,
 } from "./sidebarCollapsedAtoms";
-import { folderAncestorKeys } from "./folderPath";
+import { folderAncestorKeys, titleCreatesFolder } from "./folderPath";
 import {
   CHRONOLOGICAL_CONTAINER_ID,
   PINNED_CONTAINER_ID,
@@ -175,6 +176,7 @@ interface ProjectListThreadsSectionActionsProps {
 }
 
 interface SidebarViewOptionsMenuProps {
+  folderGroupingAvailable?: boolean;
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
@@ -469,18 +471,21 @@ function SidebarOrganizeMenuSectionLabel({
 }
 
 interface SidebarOrganizeMenuOptionProps {
+  disabled?: boolean;
   label: string;
   selected: boolean;
   onSelect: (event: Event) => void;
 }
 
 function SidebarOrganizeMenuOption({
+  disabled = false,
   label,
   selected,
   onSelect,
 }: SidebarOrganizeMenuOptionProps) {
   return (
     <DropdownMenuItem
+      disabled={disabled}
       onSelect={onSelect}
       className="flex items-center justify-between gap-3"
     >
@@ -500,6 +505,7 @@ function SidebarOrganizeMenuOption({
 // headers. The organization mode is global, so either header's menu drives the
 // whole sidebar.
 export function SidebarViewOptionsMenu({
+  folderGroupingAvailable = true,
   open,
   onOpenChange,
   onOrganizationModeSelect,
@@ -598,9 +604,13 @@ export function SidebarViewOptionsMenu({
         />
         <SidebarOrganizeMenuOption
           label="Folder"
+          disabled={!folderGroupingAvailable}
           selected={groupBy === "folder"}
           onSelect={(event) => {
             event.preventDefault();
+            if (!folderGroupingAvailable) {
+              return;
+            }
             setGroupBy("folder");
           }}
         />
@@ -1017,6 +1027,15 @@ function ProjectListComponent({
     }
     return map;
   }, [threads]);
+  const folderGroupingAvailable = useMemo(
+    () =>
+      threads.some(
+        (thread) =>
+          isSidebarProjectThread(thread) &&
+          titleCreatesFolder(thread.title ?? ""),
+      ),
+    [threads],
+  );
   const projectsState = useConnectionAwareQueryState({
     hasResolvedData: projects !== undefined,
     isFetching: sidebarNavigationQuery.isFetching,
@@ -1589,6 +1608,7 @@ function ProjectListComponent({
   const projectsSectionActions = (
     <>
       <SidebarViewOptionsMenu
+        folderGroupingAvailable={folderGroupingAvailable}
         open={isProjectsViewOptionsMenuOpen}
         onOpenChange={handleProjectsViewOptionsMenuOpenChange}
         onOrganizationModeSelect={
@@ -1613,6 +1633,7 @@ function ProjectListComponent({
         onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
       />
       <SidebarViewOptionsMenu
+        folderGroupingAvailable={folderGroupingAvailable}
         open={isThreadsViewOptionsMenuOpen}
         onOpenChange={handleThreadsViewOptionsMenuOpenChange}
       />
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index dd38ab475..5fcf281f7 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -12,9 +12,11 @@ export default {
 };
 
 function MenuStory({
+  folderGroupingAvailable = true,
   groupBy,
   sort,
 }: {
+  folderGroupingAvailable?: boolean;
   groupBy: "none" | "folder";
   sort: "updated" | "created" | "none";
 }) {
@@ -28,7 +30,10 @@ function MenuStory({
   return (
     <JotaiProvider store={store}>
       <div className="relative flex h-72 w-80 items-start justify-end rounded-md bg-sidebar p-4 text-sidebar-foreground">
-        <SidebarViewOptionsMenu open />
+        <SidebarViewOptionsMenu
+          folderGroupingAvailable={folderGroupingAvailable}
+          open
+        />
       </div>
     </JotaiProvider>
   );
@@ -43,6 +48,13 @@ export function Overview() {
       <StoryRow label="manual folders" hint="Sort by None + Group by Folder">
         <MenuStory sort="none" groupBy="folder" />
       </StoryRow>
+      <StoryRow label="no folders" hint="Folder option disabled">
+        <MenuStory
+          folderGroupingAvailable={false}
+          sort="updated"
+          groupBy="none"
+        />
+      </StoryRow>
     </StoryCard>
   );
 }
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 9c9742f2b..4b6993ca5 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -10,7 +10,6 @@ const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
-const FOLDER_ONBOARDING_SEEN_STORAGE_KEY = "bb.sidebar.folderOnboardingSeen";
 const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 
 export type SidebarSectionId = "pinned" | "projects" | "threads";
@@ -107,15 +106,6 @@ export const sidebarCollapsedFoldersAtom = atomWithStorage<string[]>(
   { getOnInit: true },
 );
 
-// Whether the first-folder onboarding modal has been accepted. Set on accept
-// (not on open), so a declined modal still teaches on a later attempt.
-export const folderOnboardingSeenAtom = atomWithStorage<boolean>(
-  FOLDER_ONBOARDING_SEEN_STORAGE_KEY,
-  false,
-  createJsonLocalStorage<boolean>(),
-  { getOnInit: true },
-);
-
 export const sidebarManualOrderAtom = atomWithStorage<SidebarManualOrder>(
   MANUAL_ORDER_STORAGE_KEY,
   {},
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index d51494d1e..cf79ff9e4 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -5,10 +5,8 @@ import {
   useEffect,
   useMemo,
   useRef,
-  useState,
   type ReactNode,
 } from "react";
-import { useAtom } from "jotai";
 import { useNavigate } from "react-router-dom";
 import { appToast } from "@/components/ui/app-toast";
 import { defaultExperiments, type Thread } from "@bb/domain";
@@ -34,17 +32,6 @@ import {
   ThreadRenameDialog,
   type ThreadRenameDialogTarget,
 } from "@/components/dialogs/ThreadRenameDialog";
-import { FolderOnboardingDialog } from "@/components/dialogs/FolderOnboardingDialog";
-import {
-  formatFolderPathLabel,
-  normalizeThreadTitle,
-  parseThreadFolderPath,
-  titleCreatesFolder,
-} from "@/components/sidebar/folderPath";
-import {
-  folderOnboardingSeenAtom,
-  sidebarGroupByAtom,
-} from "@/components/sidebar/sidebarCollapsedAtoms";
 import {
   ThreadDeleteDialog,
   type ThreadDeleteDialogTarget,
@@ -98,13 +85,6 @@ interface ThreadActionContext {
   childThreadCount: number;
 }
 
-// Full breadcrumb segments for the first-folder modal preview
-// ("Work › Q3 › Planning"): the folder ancestors plus the leaf.
-function folderPreviewSegments(title: string): string[] {
-  const { folders, leaf } = parseThreadFolderPath(title);
-  return [...folders, leaf];
-}
-
 export function ThreadActionsProvider({
   children,
 }: ThreadActionsProviderProps) {
@@ -141,23 +121,6 @@ export function ThreadActionsProvider({
   const { onClose: closeRenameDialog, onOpen: openRenameDialog } = renameDialog;
   const { onClose: closeDeleteDialog, onOpen: openDeleteDialog } = deleteDialog;
 
-  // The rename draft is lifted here (not local to the dialog) so it survives a
-  // rename → first-folder modal → rename round trip.
-  const [renameDraft, setRenameDraft] = useState("");
-  const [renameValidationError, setRenameValidationError] = useState<
-    string | null
-  >(null);
-  // Stashed rename awaiting first-folder confirmation; null when the modal is
-  // closed. Holds the raw draft so a decline can reopen rename unchanged.
-  const [pendingFolderRename, setPendingFolderRename] = useState<{
-    threadId: string;
-    draft: string;
-  } | null>(null);
-  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
-    folderOnboardingSeenAtom,
-  );
-  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-
   useEffect(() => {
     return () => {
       threadActionContextAbortRef.current?.abort();
@@ -179,88 +142,26 @@ export function ThreadActionsProvider({
 
   const requestRename = useCallback(
     (thread: Thread) => {
-      // Seed from the raw stored title (not the display fallback) so an
-      // untitled thread never parses "Thread xxxx" as a folder path.
-      setRenameDraft(thread.title ?? "");
-      setRenameValidationError(null);
-      openRenameDialog({ id: thread.id });
+      openRenameDialog({
+        id: thread.id,
+        currentTitle: getThreadDisplayTitle(thread),
+      });
     },
     [openRenameDialog],
   );
 
-  const handleRenameDraftChange = useCallback((value: string) => {
-    setRenameDraft(value);
-    setRenameValidationError(null);
-  }, []);
-
-  const submitRename = useCallback(() => {
-    const target = renameDialog.target;
-    if (!target) return;
-    const normalized = normalizeThreadTitle(renameDraft);
-    if (!normalized) {
-      setRenameValidationError("Thread name cannot be empty.");
-      return;
-    }
-    // First time a rename creates a folder: stash and teach via the modal
-    // before submitting. Afterwards (seen === true) slash renames submit directly.
-    if (titleCreatesFolder(normalized) && !folderOnboardingSeen) {
-      setPendingFolderRename({ threadId: target.id, draft: renameDraft });
-      closeRenameDialog();
-      return;
-    }
-    updateMutate(
-      { id: target.id, title: normalized },
-      { onSuccess: () => closeRenameDialog() },
-    );
-  }, [
-    closeRenameDialog,
-    folderOnboardingSeen,
-    renameDialog.target,
-    renameDraft,
-    updateMutate,
-  ]);
-
-  const handleFolderOnboardingConfirm = useCallback(() => {
-    if (!pendingFolderRename) return;
-    const { threadId, draft } = pendingFolderRename;
-    updateMutate(
-      { id: threadId, title: normalizeThreadTitle(draft) },
-      {
-        onSuccess: () => {
-          setFolderOnboardingSeen(true);
-          // Auto-enable folder grouping once, so the new folder is visible.
-          if (groupBy === "none") {
-            setGroupBy("folder");
-          }
-          setPendingFolderRename(null);
+  const submitRename = useCallback(
+    (threadId: string, title: string) => {
+      updateMutate(
+        { id: threadId, title },
+        {
+          onSuccess: () => {
+            closeRenameDialog();
+          },
         },
-      },
-    );
-  }, [
-    groupBy,
-    pendingFolderRename,
-    setFolderOnboardingSeen,
-    setGroupBy,
-    updateMutate,
-  ]);
-
-  const handleFolderOnboardingCancel = useCallback(() => {
-    if (!pendingFolderRename) return;
-    // Reopen rename seeded from the stashed draft; seen stays false so the
-    // modal still teaches on a later attempt.
-    setRenameDraft(pendingFolderRename.draft);
-    setRenameValidationError(null);
-    openRenameDialog({ id: pendingFolderRename.threadId });
-    setPendingFolderRename(null);
-  }, [openRenameDialog, pendingFolderRename]);
-
-  const handleFolderOnboardingOpenChange = useCallback(
-    (open: boolean) => {
-      if (!open) {
-        handleFolderOnboardingCancel();
-      }
+      );
     },
-    [handleFolderOnboardingCancel],
+    [closeRenameDialog, updateMutate],
   );
 
   // Fetches the delete dialog context. Returns null when the caller's request
@@ -503,27 +404,9 @@ export function ThreadActionsProvider({
       {children}
       <ThreadRenameDialog
         target={renameDialog.target}
-        draft={renameDraft}
-        validationMessage={renameValidationError}
         pending={updateThread.isPending}
-        onDraftChange={handleRenameDraftChange}
-        onSubmit={submitRename}
         onOpenChange={renameDialog.onOpenChange}
-      />
-      <FolderOnboardingDialog
-        open={pendingFolderRename !== null}
-        pathLabel={
-          pendingFolderRename
-            ? formatFolderPathLabel(
-                folderPreviewSegments(pendingFolderRename.draft),
-              )
-            : ""
-        }
-        showGroupingHint={groupBy === "none"}
-        pending={updateThread.isPending}
-        onConfirm={handleFolderOnboardingConfirm}
-        onCancel={handleFolderOnboardingCancel}
-        onOpenChange={handleFolderOnboardingOpenChange}
+        onRename={submitRename}
       />
       <ThreadDeleteDialog
         target={deleteDialog.target}

From bd0a339281296a81f6763c9b3be627abededde46 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 22:11:34 -0700
Subject: [PATCH 08/54] Restore first folder onboarding flow

---
 .../FolderOnboardingDialog.stories.tsx        |  53 +++++++++
 .../dialogs/FolderOnboardingDialog.tsx        | 110 ++++++++++++++++++
 .../sidebar/sidebarCollapsedAtoms.ts          |  10 ++
 .../thread/ThreadActionsProvider.tsx          | 105 ++++++++++++++++-
 4 files changed, 272 insertions(+), 6 deletions(-)
 create mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
 create mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.tsx

diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
new file mode 100644
index 000000000..dc588739f
--- /dev/null
+++ b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
@@ -0,0 +1,53 @@
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { DialogStage } from "../../../.ladle/story-dialog-stage";
+import { FolderOnboardingDialogContent } from "./FolderOnboardingDialog";
+
+export default {
+  title: "dialogs/Folder onboarding",
+};
+
+const noop = () => {};
+
+function OnboardingStory({
+  pathLabel,
+  pending = false,
+  showGroupingHint = true,
+}: {
+  pathLabel: string;
+  pending?: boolean;
+  showGroupingHint?: boolean;
+}) {
+  return (
+    <DialogStage>
+      <FolderOnboardingDialogContent
+        pathLabel={pathLabel}
+        showGroupingHint={showGroupingHint}
+        pending={pending}
+        onConfirm={noop}
+        onCancel={noop}
+      />
+    </DialogStage>
+  );
+}
+
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow label="default" hint="first folder creation, grouping off">
+        <OnboardingStory pathLabel="Work / Q3 / Planning" />
+      </StoryRow>
+      <StoryRow label="grouping already on" hint="no auto-enable hint">
+        <OnboardingStory
+          pathLabel="Clients / Acme / Onboarding"
+          showGroupingHint={false}
+        />
+      </StoryRow>
+      <StoryRow label="long path" hint="preview wraps in the dialog body">
+        <OnboardingStory pathLabel="Customers / Enterprise rollout / Migration planning / Cutover checklist" />
+      </StoryRow>
+      <StoryRow label="pending" hint="buttons disabled while rename submits">
+        <OnboardingStory pathLabel="Work / Q4 / Roadmap" pending />
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
new file mode 100644
index 000000000..1df41f0d4
--- /dev/null
+++ b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
@@ -0,0 +1,110 @@
+import { Button } from "@/components/ui/button.js";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.js";
+
+interface FolderOnboardingDialogContentProps {
+  // The user's entry previewed as breadcrumbs ("Work › Q3 › Planning").
+  pathLabel: string;
+  // Only shown when grouping is currently off, since accepting turns it on.
+  showGroupingHint: boolean;
+  pending: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+/**
+ * Body of the first-folder confirmation: explains that "/" files a thread into
+ * a folder, previews the resulting path, and offers Create / Cancel. Split from
+ * the modal shell so stories can render it without the overlay (mirrors
+ * {@link ConfirmDeleteDialogContent}).
+ */
+export function FolderOnboardingDialogContent({
+  pathLabel,
+  showGroupingHint,
+  pending,
+  onConfirm,
+  onCancel,
+}: FolderOnboardingDialogContentProps) {
+  return (
+    <>
+      <DialogHeader>
+        <DialogTitle>Organize threads into folders</DialogTitle>
+        <DialogDescription>
+          Using “/” groups this thread into a folder:
+        </DialogDescription>
+      </DialogHeader>
+      <div className="space-y-2 text-sm">
+        <div className="rounded-md bg-muted px-3 py-2 font-medium break-words">
+          {pathLabel}
+        </div>
+        {showGroupingHint ? (
+          <p className="text-muted-foreground">
+            Folder grouping will turn on so you can see it.
+          </p>
+        ) : null}
+      </div>
+      <DialogFooter>
+        <Button
+          type="button"
+          variant="outline"
+          disabled={pending}
+          onClick={onCancel}
+        >
+          Cancel
+        </Button>
+        <Button type="button" disabled={pending} onClick={onConfirm}>
+          Create folder
+        </Button>
+      </DialogFooter>
+    </>
+  );
+}
+
+interface FolderOnboardingDialogProps {
+  open: boolean;
+  pathLabel: string;
+  showGroupingHint: boolean;
+  pending: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+  // Esc / overlay dismiss routes back through cancel (reopen rename).
+  onOpenChange: (open: boolean) => void;
+}
+
+/**
+ * First-folder confirmation modal, shown the first time a rename would create a
+ * folder. Accepting submits the rename and enables folder grouping; declining
+ * (button, Esc, or overlay) hands control back to the rename dialog with the
+ * draft intact.
+ */
+export function FolderOnboardingDialog({
+  open,
+  pathLabel,
+  showGroupingHint,
+  pending,
+  onConfirm,
+  onCancel,
+  onOpenChange,
+}: FolderOnboardingDialogProps) {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        {open ? (
+          <FolderOnboardingDialogContent
+            pathLabel={pathLabel}
+            showGroupingHint={showGroupingHint}
+            pending={pending}
+            onConfirm={onConfirm}
+            onCancel={onCancel}
+          />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 4b6993ca5..9c9742f2b 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -10,6 +10,7 @@ const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
+const FOLDER_ONBOARDING_SEEN_STORAGE_KEY = "bb.sidebar.folderOnboardingSeen";
 const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 
 export type SidebarSectionId = "pinned" | "projects" | "threads";
@@ -106,6 +107,15 @@ export const sidebarCollapsedFoldersAtom = atomWithStorage<string[]>(
   { getOnInit: true },
 );
 
+// Whether the first-folder onboarding modal has been accepted. Set on accept
+// (not on open), so a declined modal still teaches on a later attempt.
+export const folderOnboardingSeenAtom = atomWithStorage<boolean>(
+  FOLDER_ONBOARDING_SEEN_STORAGE_KEY,
+  false,
+  createJsonLocalStorage<boolean>(),
+  { getOnInit: true },
+);
+
 export const sidebarManualOrderAtom = atomWithStorage<SidebarManualOrder>(
   MANUAL_ORDER_STORAGE_KEY,
   {},
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index cf79ff9e4..8a5a22875 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -5,8 +5,10 @@ import {
   useEffect,
   useMemo,
   useRef,
+  useState,
   type ReactNode,
 } from "react";
+import { useAtom } from "jotai";
 import { useNavigate } from "react-router-dom";
 import { appToast } from "@/components/ui/app-toast";
 import { defaultExperiments, type Thread } from "@bb/domain";
@@ -32,17 +34,24 @@ import {
   ThreadRenameDialog,
   type ThreadRenameDialogTarget,
 } from "@/components/dialogs/ThreadRenameDialog";
+import { FolderOnboardingDialog } from "@/components/dialogs/FolderOnboardingDialog";
 import {
   ThreadDeleteDialog,
   type ThreadDeleteDialogTarget,
 } from "@/components/dialogs/ThreadDeleteDialog";
 import { ArchivedThreadToastTitle } from "@/components/thread/ArchivedThreadToastTitle";
 import { destroyPersistedBrowserViewsForThread } from "@/components/secondary-panel/browserViewVisibilityCoordinator";
-import { getThreadReadToggleAction } from "@/components/sidebar/threadReadState";
 import {
-  getRootComposeRoutePath,
-  getThreadRoutePath,
-} from "@/lib/route-paths";
+  formatFolderPathLabel,
+  parseThreadFolderPath,
+  titleCreatesFolder,
+} from "@/components/sidebar/folderPath";
+import {
+  folderOnboardingSeenAtom,
+  sidebarGroupByAtom,
+} from "@/components/sidebar/sidebarCollapsedAtoms";
+import { getThreadReadToggleAction } from "@/components/sidebar/threadReadState";
+import { getRootComposeRoutePath, getThreadRoutePath } from "@/lib/route-paths";
 import { getDesktopBrowserApi, getDesktopPopoutApi } from "@/lib/bb-desktop";
 import { useSetRootComposeProjectId } from "@/lib/root-compose-selection";
 import { useSystemConfig } from "@/hooks/queries/system-queries";
@@ -85,6 +94,11 @@ interface ThreadActionContext {
   childThreadCount: number;
 }
 
+function folderPreviewSegments(title: string): string[] {
+  const { folders, leaf } = parseThreadFolderPath(title);
+  return [...folders, leaf];
+}
+
 export function ThreadActionsProvider({
   children,
 }: ThreadActionsProviderProps) {
@@ -100,6 +114,14 @@ export function ThreadActionsProvider({
   const deleteThread = useDeleteThread();
   const updateThread = useUpdateThread();
   const systemConfigQuery = useSystemConfig();
+  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
+  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
+    folderOnboardingSeenAtom,
+  );
+  const [pendingFolderRename, setPendingFolderRename] = useState<{
+    threadId: string;
+    title: string;
+  } | null>(null);
   const threadActionContextAbortRef = useRef<AbortController | null>(null);
   // Destructure `.mutate` so useCallback deps see stable references across
   // renders. Depending on the full mutation objects would churn callback
@@ -152,16 +174,70 @@ export function ThreadActionsProvider({
 
   const submitRename = useCallback(
     (threadId: string, title: string) => {
+      if (titleCreatesFolder(title) && !folderOnboardingSeen) {
+        setPendingFolderRename({ threadId, title });
+        closeRenameDialog();
+        return;
+      }
       updateMutate(
         { id: threadId, title },
         {
           onSuccess: () => {
+            if (groupBy === "none" && titleCreatesFolder(title)) {
+              setGroupBy("folder");
+            }
             closeRenameDialog();
           },
         },
       );
     },
-    [closeRenameDialog, updateMutate],
+    [
+      closeRenameDialog,
+      folderOnboardingSeen,
+      groupBy,
+      setGroupBy,
+      updateMutate,
+    ],
+  );
+
+  const confirmFolderOnboarding = useCallback(() => {
+    if (!pendingFolderRename) return;
+    updateMutate(
+      { id: pendingFolderRename.threadId, title: pendingFolderRename.title },
+      {
+        onSuccess: () => {
+          setFolderOnboardingSeen(true);
+          if (groupBy === "none") {
+            setGroupBy("folder");
+          }
+          setPendingFolderRename(null);
+        },
+      },
+    );
+  }, [
+    groupBy,
+    pendingFolderRename,
+    setFolderOnboardingSeen,
+    setGroupBy,
+    updateMutate,
+  ]);
+
+  const cancelFolderOnboarding = useCallback(() => {
+    if (!pendingFolderRename) return;
+    openRenameDialog({
+      id: pendingFolderRename.threadId,
+      currentTitle: pendingFolderRename.title,
+    });
+    setPendingFolderRename(null);
+  }, [openRenameDialog, pendingFolderRename]);
+
+  const handleFolderOnboardingOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) {
+        cancelFolderOnboarding();
+      }
+    },
+    [cancelFolderOnboarding],
   );
 
   // Fetches the delete dialog context. Returns null when the caller's request
@@ -366,7 +442,9 @@ export function ThreadActionsProvider({
 
   const experiments = systemConfigQuery.data?.experiments ?? defaultExperiments;
   const desktopPopout = getDesktopPopoutApi();
-  const sendToPopout = useMemo<ThreadActionsContextValue["sendToPopout"]>(() => {
+  const sendToPopout = useMemo<
+    ThreadActionsContextValue["sendToPopout"]
+  >(() => {
     if (!experiments.popoutChat || desktopPopout === null) {
       return null;
     }
@@ -408,6 +486,21 @@ export function ThreadActionsProvider({
         onOpenChange={renameDialog.onOpenChange}
         onRename={submitRename}
       />
+      <FolderOnboardingDialog
+        open={pendingFolderRename !== null}
+        pathLabel={
+          pendingFolderRename
+            ? formatFolderPathLabel(
+                folderPreviewSegments(pendingFolderRename.title),
+              )
+            : ""
+        }
+        showGroupingHint={groupBy === "none"}
+        pending={updateThread.isPending}
+        onConfirm={confirmFolderOnboarding}
+        onCancel={cancelFolderOnboarding}
+        onOpenChange={handleFolderOnboardingOpenChange}
+      />
       <ThreadDeleteDialog
         target={deleteDialog.target}
         pending={deleteThread.isPending}

From cccd900370aa6dd3dd6fb7eff121f285235c7095 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 22:14:55 -0700
Subject: [PATCH 09/54] Auto-enable folders for existing slash titles

---
 .../src/components/sidebar/ProjectList.tsx    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index f380325e4..df6489302 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -89,6 +89,7 @@ import {
   collapsedProjectIdsAtom,
   collapsedSidebarSectionIdsAtom,
   DEFAULT_SIDEBAR_SECTION_ORDER,
+  folderOnboardingSeenAtom,
   sidebarChronologicalSortAtom,
   sidebarCollapsedFoldersAtom,
   sidebarGroupByAtom,
@@ -1214,7 +1215,10 @@ function ProjectListComponent({
   );
   const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
   const [chronologicalSort] = useAtom(sidebarChronologicalSortAtom);
-  const [groupBy] = useAtom(sidebarGroupByAtom);
+  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
+  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
+    folderOnboardingSeenAtom,
+  );
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
@@ -1272,6 +1276,26 @@ function ProjectListComponent({
     normalizedCollapsedSidebarSectionIds,
     setCollapsedSidebarSectionIdList,
   ]);
+  // Existing slash-titled threads may predate the first-folder confirmation
+  // flow. Auto-enable grouping once so refreshes render those titles as folders,
+  // then mark the migration handled so a later explicit "None" choice sticks.
+  useEffect(() => {
+    if (
+      !folderGroupingAvailable ||
+      folderOnboardingSeen ||
+      groupBy !== "none"
+    ) {
+      return;
+    }
+    setGroupBy("folder");
+    setFolderOnboardingSeen(true);
+  }, [
+    folderGroupingAvailable,
+    folderOnboardingSeen,
+    groupBy,
+    setFolderOnboardingSeen,
+    setGroupBy,
+  ]);
   const pinnedSidebarState = useMemo(
     () => buildPinnedSidebarState({ threads, groupBy }),
     [threads, groupBy],

From a4b14f70a7d022fbccc3391754f353035cf244e8 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 22:18:04 -0700
Subject: [PATCH 10/54] Inline folder rename hint

---
 .../FolderOnboardingDialog.stories.tsx        |  53 ---------
 .../dialogs/FolderOnboardingDialog.tsx        | 110 ------------------
 .../dialogs/ThreadRenameDialog.stories.tsx    |  15 +++
 .../components/dialogs/ThreadRenameDialog.tsx |  18 ++-
 .../src/components/sidebar/ProjectList.tsx    |  28 ++---
 .../sidebar/sidebarCollapsedAtoms.ts          |  11 +-
 .../thread/ThreadActionsProvider.tsx          |  92 ++-------------
 7 files changed, 61 insertions(+), 266 deletions(-)
 delete mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
 delete mode 100644 apps/app/src/components/dialogs/FolderOnboardingDialog.tsx

diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
deleted file mode 100644
index dc588739f..000000000
--- a/apps/app/src/components/dialogs/FolderOnboardingDialog.stories.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { StoryCard, StoryRow } from "../../../.ladle/story-card";
-import { DialogStage } from "../../../.ladle/story-dialog-stage";
-import { FolderOnboardingDialogContent } from "./FolderOnboardingDialog";
-
-export default {
-  title: "dialogs/Folder onboarding",
-};
-
-const noop = () => {};
-
-function OnboardingStory({
-  pathLabel,
-  pending = false,
-  showGroupingHint = true,
-}: {
-  pathLabel: string;
-  pending?: boolean;
-  showGroupingHint?: boolean;
-}) {
-  return (
-    <DialogStage>
-      <FolderOnboardingDialogContent
-        pathLabel={pathLabel}
-        showGroupingHint={showGroupingHint}
-        pending={pending}
-        onConfirm={noop}
-        onCancel={noop}
-      />
-    </DialogStage>
-  );
-}
-
-export function Overview() {
-  return (
-    <StoryCard>
-      <StoryRow label="default" hint="first folder creation, grouping off">
-        <OnboardingStory pathLabel="Work / Q3 / Planning" />
-      </StoryRow>
-      <StoryRow label="grouping already on" hint="no auto-enable hint">
-        <OnboardingStory
-          pathLabel="Clients / Acme / Onboarding"
-          showGroupingHint={false}
-        />
-      </StoryRow>
-      <StoryRow label="long path" hint="preview wraps in the dialog body">
-        <OnboardingStory pathLabel="Customers / Enterprise rollout / Migration planning / Cutover checklist" />
-      </StoryRow>
-      <StoryRow label="pending" hint="buttons disabled while rename submits">
-        <OnboardingStory pathLabel="Work / Q4 / Roadmap" pending />
-      </StoryRow>
-    </StoryCard>
-  );
-}
diff --git a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx b/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
deleted file mode 100644
index 1df41f0d4..000000000
--- a/apps/app/src/components/dialogs/FolderOnboardingDialog.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Button } from "@/components/ui/button.js";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog.js";
-
-interface FolderOnboardingDialogContentProps {
-  // The user's entry previewed as breadcrumbs ("Work › Q3 › Planning").
-  pathLabel: string;
-  // Only shown when grouping is currently off, since accepting turns it on.
-  showGroupingHint: boolean;
-  pending: boolean;
-  onConfirm: () => void;
-  onCancel: () => void;
-}
-
-/**
- * Body of the first-folder confirmation: explains that "/" files a thread into
- * a folder, previews the resulting path, and offers Create / Cancel. Split from
- * the modal shell so stories can render it without the overlay (mirrors
- * {@link ConfirmDeleteDialogContent}).
- */
-export function FolderOnboardingDialogContent({
-  pathLabel,
-  showGroupingHint,
-  pending,
-  onConfirm,
-  onCancel,
-}: FolderOnboardingDialogContentProps) {
-  return (
-    <>
-      <DialogHeader>
-        <DialogTitle>Organize threads into folders</DialogTitle>
-        <DialogDescription>
-          Using “/” groups this thread into a folder:
-        </DialogDescription>
-      </DialogHeader>
-      <div className="space-y-2 text-sm">
-        <div className="rounded-md bg-muted px-3 py-2 font-medium break-words">
-          {pathLabel}
-        </div>
-        {showGroupingHint ? (
-          <p className="text-muted-foreground">
-            Folder grouping will turn on so you can see it.
-          </p>
-        ) : null}
-      </div>
-      <DialogFooter>
-        <Button
-          type="button"
-          variant="outline"
-          disabled={pending}
-          onClick={onCancel}
-        >
-          Cancel
-        </Button>
-        <Button type="button" disabled={pending} onClick={onConfirm}>
-          Create folder
-        </Button>
-      </DialogFooter>
-    </>
-  );
-}
-
-interface FolderOnboardingDialogProps {
-  open: boolean;
-  pathLabel: string;
-  showGroupingHint: boolean;
-  pending: boolean;
-  onConfirm: () => void;
-  onCancel: () => void;
-  // Esc / overlay dismiss routes back through cancel (reopen rename).
-  onOpenChange: (open: boolean) => void;
-}
-
-/**
- * First-folder confirmation modal, shown the first time a rename would create a
- * folder. Accepting submits the rename and enables folder grouping; declining
- * (button, Esc, or overlay) hands control back to the rename dialog with the
- * draft intact.
- */
-export function FolderOnboardingDialog({
-  open,
-  pathLabel,
-  showGroupingHint,
-  pending,
-  onConfirm,
-  onCancel,
-  onOpenChange,
-}: FolderOnboardingDialogProps) {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        {open ? (
-          <FolderOnboardingDialogContent
-            pathLabel={pathLabel}
-            showGroupingHint={showGroupingHint}
-            pending={pending}
-            onConfirm={onConfirm}
-            onCancel={onCancel}
-          />
-        ) : null}
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
index 558998bb4..db0fee1e7 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
@@ -22,6 +22,11 @@ const parentTarget: ThreadRenameDialogTarget = {
   currentTitle: "Frontend Parent",
 };
 
+const folderTarget: ThreadRenameDialogTarget = {
+  id: "thr_folder",
+  currentTitle: "test/say hi",
+};
+
 const longTitleTarget: ThreadRenameDialogTarget = {
   id: "thr_long",
   currentTitle:
@@ -55,6 +60,16 @@ export function Overview() {
           />
         </DialogStage>
       </StoryRow>
+      <StoryRow label="folder path" hint="slash title creates a folder">
+        <DialogStage>
+          <ThreadRenameDialogContent
+            target={folderTarget}
+            pending={false}
+            onRename={noop}
+            inputRef={inputRef}
+          />
+        </DialogStage>
+      </StoryRow>
       <StoryRow
         label="pending"
         hint="submit in flight — input and submit are disabled"
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
index d45e3e2d5..843b5f09d 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
@@ -1,8 +1,16 @@
 import { capitalize } from "@bb/thread-view";
 import { useId, useState, type FormEvent, type RefObject } from "react";
 import { Button } from "@/components/ui/button.js";
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog.js";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.js";
 import { Input } from "@/components/ui/input.js";
+import { titleCreatesFolder } from "@/components/sidebar/folderPath";
 import { useNameValidation } from "./useNameValidation.js";
 import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
 
@@ -61,6 +69,7 @@ export function ThreadRenameDialogContent({
   const { validationMessage, validate, clearMessage } = useNameValidation({
     emptyMessage: `${capitalize(label)} name cannot be empty.`,
   });
+  const createsFolder = titleCreatesFolder(nextTitle);
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
@@ -99,10 +108,15 @@ export function ThreadRenameDialogContent({
           {validationMessage ? (
             <p className="text-sm text-destructive">{validationMessage}</p>
           ) : null}
+          {createsFolder ? (
+            <p className="text-sm text-muted-foreground">
+              Using “/” groups this thread into a folder
+            </p>
+          ) : null}
         </div>
         <DialogFooter>
           <Button type="submit" disabled={pending}>
-            Rename {label}
+            {createsFolder ? "Create folder & rename" : `Rename ${label}`}
           </Button>
         </DialogFooter>
       </form>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index df6489302..0477a9bbd 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -89,9 +89,9 @@ import {
   collapsedProjectIdsAtom,
   collapsedSidebarSectionIdsAtom,
   DEFAULT_SIDEBAR_SECTION_ORDER,
-  folderOnboardingSeenAtom,
   sidebarChronologicalSortAtom,
   sidebarCollapsedFoldersAtom,
+  sidebarFolderGroupingAutoEnabledAtom,
   sidebarGroupByAtom,
   sidebarOrganizationModeAtom,
   sidebarSectionOrderAtom,
@@ -1216,8 +1216,8 @@ function ProjectListComponent({
   const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
   const [chronologicalSort] = useAtom(sidebarChronologicalSortAtom);
   const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
-    folderOnboardingSeenAtom,
+  const [folderGroupingAutoEnabled, setFolderGroupingAutoEnabled] = useAtom(
+    sidebarFolderGroupingAutoEnabledAtom,
   );
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
@@ -1276,24 +1276,24 @@ function ProjectListComponent({
     normalizedCollapsedSidebarSectionIds,
     setCollapsedSidebarSectionIdList,
   ]);
-  // Existing slash-titled threads may predate the first-folder confirmation
-  // flow. Auto-enable grouping once so refreshes render those titles as folders,
-  // then mark the migration handled so a later explicit "None" choice sticks.
+  // Existing slash-titled threads may predate folder grouping. Auto-enable once
+  // so refreshes render those titles as folders, then mark it handled so a
+  // later explicit "None" choice sticks.
   useEffect(() => {
-    if (
-      !folderGroupingAvailable ||
-      folderOnboardingSeen ||
-      groupBy !== "none"
-    ) {
+    if (!folderGroupingAvailable || folderGroupingAutoEnabled) {
+      return;
+    }
+    if (groupBy === "folder") {
+      setFolderGroupingAutoEnabled(true);
       return;
     }
     setGroupBy("folder");
-    setFolderOnboardingSeen(true);
+    setFolderGroupingAutoEnabled(true);
   }, [
+    folderGroupingAutoEnabled,
     folderGroupingAvailable,
-    folderOnboardingSeen,
     groupBy,
-    setFolderOnboardingSeen,
+    setFolderGroupingAutoEnabled,
     setGroupBy,
   ]);
   const pinnedSidebarState = useMemo(
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 9c9742f2b..8da02e3fe 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -10,7 +10,8 @@ const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
-const FOLDER_ONBOARDING_SEEN_STORAGE_KEY = "bb.sidebar.folderOnboardingSeen";
+const FOLDER_GROUPING_AUTO_ENABLED_STORAGE_KEY =
+  "bb.sidebar.folderGroupingAutoEnabled";
 const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 
 export type SidebarSectionId = "pinned" | "projects" | "threads";
@@ -107,10 +108,10 @@ export const sidebarCollapsedFoldersAtom = atomWithStorage<string[]>(
   { getOnInit: true },
 );
 
-// Whether the first-folder onboarding modal has been accepted. Set on accept
-// (not on open), so a declined modal still teaches on a later attempt.
-export const folderOnboardingSeenAtom = atomWithStorage<boolean>(
-  FOLDER_ONBOARDING_SEEN_STORAGE_KEY,
+// Whether slash-titled threads have already auto-enabled folder grouping. Once
+// true, a later explicit Group by: None choice should stick across refreshes.
+export const sidebarFolderGroupingAutoEnabledAtom = atomWithStorage<boolean>(
+  FOLDER_GROUPING_AUTO_ENABLED_STORAGE_KEY,
   false,
   createJsonLocalStorage<boolean>(),
   { getOnInit: true },
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index 8a5a22875..3a0fea4a4 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -5,7 +5,6 @@ import {
   useEffect,
   useMemo,
   useRef,
-  useState,
   type ReactNode,
 } from "react";
 import { useAtom } from "jotai";
@@ -34,20 +33,15 @@ import {
   ThreadRenameDialog,
   type ThreadRenameDialogTarget,
 } from "@/components/dialogs/ThreadRenameDialog";
-import { FolderOnboardingDialog } from "@/components/dialogs/FolderOnboardingDialog";
 import {
   ThreadDeleteDialog,
   type ThreadDeleteDialogTarget,
 } from "@/components/dialogs/ThreadDeleteDialog";
 import { ArchivedThreadToastTitle } from "@/components/thread/ArchivedThreadToastTitle";
 import { destroyPersistedBrowserViewsForThread } from "@/components/secondary-panel/browserViewVisibilityCoordinator";
+import { titleCreatesFolder } from "@/components/sidebar/folderPath";
 import {
-  formatFolderPathLabel,
-  parseThreadFolderPath,
-  titleCreatesFolder,
-} from "@/components/sidebar/folderPath";
-import {
-  folderOnboardingSeenAtom,
+  sidebarFolderGroupingAutoEnabledAtom,
   sidebarGroupByAtom,
 } from "@/components/sidebar/sidebarCollapsedAtoms";
 import { getThreadReadToggleAction } from "@/components/sidebar/threadReadState";
@@ -94,11 +88,6 @@ interface ThreadActionContext {
   childThreadCount: number;
 }
 
-function folderPreviewSegments(title: string): string[] {
-  const { folders, leaf } = parseThreadFolderPath(title);
-  return [...folders, leaf];
-}
-
 export function ThreadActionsProvider({
   children,
 }: ThreadActionsProviderProps) {
@@ -115,13 +104,9 @@ export function ThreadActionsProvider({
   const updateThread = useUpdateThread();
   const systemConfigQuery = useSystemConfig();
   const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-  const [folderOnboardingSeen, setFolderOnboardingSeen] = useAtom(
-    folderOnboardingSeenAtom,
+  const [, setFolderGroupingAutoEnabled] = useAtom(
+    sidebarFolderGroupingAutoEnabledAtom,
   );
-  const [pendingFolderRename, setPendingFolderRename] = useState<{
-    threadId: string;
-    title: string;
-  } | null>(null);
   const threadActionContextAbortRef = useRef<AbortController | null>(null);
   // Destructure `.mutate` so useCallback deps see stable references across
   // renders. Depending on the full mutation objects would churn callback
@@ -174,17 +159,15 @@ export function ThreadActionsProvider({
 
   const submitRename = useCallback(
     (threadId: string, title: string) => {
-      if (titleCreatesFolder(title) && !folderOnboardingSeen) {
-        setPendingFolderRename({ threadId, title });
-        closeRenameDialog();
-        return;
-      }
       updateMutate(
         { id: threadId, title },
         {
           onSuccess: () => {
-            if (groupBy === "none" && titleCreatesFolder(title)) {
-              setGroupBy("folder");
+            if (titleCreatesFolder(title)) {
+              setFolderGroupingAutoEnabled(true);
+              if (groupBy === "none") {
+                setGroupBy("folder");
+              }
             }
             closeRenameDialog();
           },
@@ -193,53 +176,13 @@ export function ThreadActionsProvider({
     },
     [
       closeRenameDialog,
-      folderOnboardingSeen,
       groupBy,
+      setFolderGroupingAutoEnabled,
       setGroupBy,
       updateMutate,
     ],
   );
 
-  const confirmFolderOnboarding = useCallback(() => {
-    if (!pendingFolderRename) return;
-    updateMutate(
-      { id: pendingFolderRename.threadId, title: pendingFolderRename.title },
-      {
-        onSuccess: () => {
-          setFolderOnboardingSeen(true);
-          if (groupBy === "none") {
-            setGroupBy("folder");
-          }
-          setPendingFolderRename(null);
-        },
-      },
-    );
-  }, [
-    groupBy,
-    pendingFolderRename,
-    setFolderOnboardingSeen,
-    setGroupBy,
-    updateMutate,
-  ]);
-
-  const cancelFolderOnboarding = useCallback(() => {
-    if (!pendingFolderRename) return;
-    openRenameDialog({
-      id: pendingFolderRename.threadId,
-      currentTitle: pendingFolderRename.title,
-    });
-    setPendingFolderRename(null);
-  }, [openRenameDialog, pendingFolderRename]);
-
-  const handleFolderOnboardingOpenChange = useCallback(
-    (open: boolean) => {
-      if (!open) {
-        cancelFolderOnboarding();
-      }
-    },
-    [cancelFolderOnboarding],
-  );
-
   // Fetches the delete dialog context. Returns null when the caller's request
   // was superseded (a newer click aborted us) or the fetch errored; in the
   // error case, also surfaces a toast before returning.
@@ -486,21 +429,6 @@ export function ThreadActionsProvider({
         onOpenChange={renameDialog.onOpenChange}
         onRename={submitRename}
       />
-      <FolderOnboardingDialog
-        open={pendingFolderRename !== null}
-        pathLabel={
-          pendingFolderRename
-            ? formatFolderPathLabel(
-                folderPreviewSegments(pendingFolderRename.title),
-              )
-            : ""
-        }
-        showGroupingHint={groupBy === "none"}
-        pending={updateThread.isPending}
-        onConfirm={confirmFolderOnboarding}
-        onCancel={cancelFolderOnboarding}
-        onOpenChange={handleFolderOnboardingOpenChange}
-      />
       <ThreadDeleteDialog
         target={deleteDialog.target}
         pending={deleteThread.isPending}

From e767b2446fce416c798b0a570196d0daa576d1a8 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 22:23:58 -0700
Subject: [PATCH 11/54] Organize sidebar by cross-project folders

---
 .../src/components/sidebar/ProjectList.tsx    | 70 +++++++++++--------
 .../SidebarViewOptionsMenu.stories.tsx        | 20 ++++--
 .../thread/ThreadActionsProvider.tsx          |  4 ++
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 0477a9bbd..e91edab29 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -518,6 +518,9 @@ export function SidebarViewOptionsMenu({
     sidebarChronologicalSortAtom,
   );
   const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
+  const setFolderGroupingAutoEnabled = useSetAtom(
+    sidebarFolderGroupingAutoEnabledAtom,
+  );
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -547,19 +550,42 @@ export function SidebarViewOptionsMenu({
         </SidebarOrganizeMenuSectionLabel>
         <SidebarOrganizeMenuOption
           label="Project"
-          selected={organizationMode === "project"}
+          selected={organizationMode === "project" && groupBy === "none"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("project");
+            setGroupBy("none");
+            if (folderGroupingAvailable) {
+              setFolderGroupingAutoEnabled(true);
+            }
             onOrganizationModeSelect?.("project");
           }}
         />
+        <SidebarOrganizeMenuOption
+          label="Folder"
+          disabled={!folderGroupingAvailable}
+          selected={groupBy === "folder"}
+          onSelect={(event) => {
+            event.preventDefault();
+            if (!folderGroupingAvailable) {
+              return;
+            }
+            setOrganizationMode("chronological");
+            setGroupBy("folder");
+            setFolderGroupingAutoEnabled(true);
+            onOrganizationModeSelect?.("chronological");
+          }}
+        />
         <SidebarOrganizeMenuOption
           label="None"
-          selected={organizationMode === "chronological"}
+          selected={organizationMode === "chronological" && groupBy === "none"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("chronological");
+            setGroupBy("none");
+            if (folderGroupingAvailable) {
+              setFolderGroupingAutoEnabled(true);
+            }
             onOrganizationModeSelect?.("chronological");
           }}
         />
@@ -591,30 +617,6 @@ export function SidebarViewOptionsMenu({
             setChronologicalSort("none");
           }}
         />
-        <DropdownMenuSeparator />
-        <SidebarOrganizeMenuSectionLabel className="pt-2">
-          Group by
-        </SidebarOrganizeMenuSectionLabel>
-        <SidebarOrganizeMenuOption
-          label="None"
-          selected={groupBy === "none"}
-          onSelect={(event) => {
-            event.preventDefault();
-            setGroupBy("none");
-          }}
-        />
-        <SidebarOrganizeMenuOption
-          label="Folder"
-          disabled={!folderGroupingAvailable}
-          selected={groupBy === "folder"}
-          onSelect={(event) => {
-            event.preventDefault();
-            if (!folderGroupingAvailable) {
-              return;
-            }
-            setGroupBy("folder");
-          }}
-        />
       </DropdownMenuContent>
     </DropdownMenu>
   );
@@ -1213,7 +1215,9 @@ function ProjectListComponent({
     },
     [],
   );
-  const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
+  const [organizationMode, setOrganizationMode] = useAtom(
+    sidebarOrganizationModeAtom,
+  );
   const [chronologicalSort] = useAtom(sidebarChronologicalSortAtom);
   const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
   const [folderGroupingAutoEnabled, setFolderGroupingAutoEnabled] = useAtom(
@@ -1284,17 +1288,25 @@ function ProjectListComponent({
       return;
     }
     if (groupBy === "folder") {
+      if (organizationMode !== "chronological") {
+        setOrganizationMode("chronological");
+      }
       setFolderGroupingAutoEnabled(true);
       return;
     }
+    if (organizationMode !== "chronological") {
+      setOrganizationMode("chronological");
+    }
     setGroupBy("folder");
     setFolderGroupingAutoEnabled(true);
   }, [
     folderGroupingAutoEnabled,
     folderGroupingAvailable,
     groupBy,
+    organizationMode,
     setFolderGroupingAutoEnabled,
     setGroupBy,
+    setOrganizationMode,
   ]);
   const pinnedSidebarState = useMemo(
     () => buildPinnedSidebarState({ threads, groupBy }),
@@ -1692,7 +1704,7 @@ function ProjectListComponent({
     );
   }
 
-  if (organizationMode === "chronological") {
+  if (organizationMode === "chronological" || groupBy === "folder") {
     return (
       <ProjectListShell>
         <div className="space-y-4">
@@ -1702,7 +1714,7 @@ function ProjectListComponent({
             </TopLevelSidebarSection>
           ) : null}
           <TopLevelSidebarSection
-            label="All Threads"
+            label={groupBy === "folder" ? "Folders" : "All Threads"}
             actions={threadsSectionActions}
             actionsOpen={
               isThreadsActionsMenuOpen || isThreadsViewOptionsMenuOpen
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 5fcf281f7..1b99271c5 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -5,6 +5,8 @@ import { SidebarViewOptionsMenu } from "./ProjectList";
 import {
   sidebarChronologicalSortAtom,
   sidebarGroupByAtom,
+  sidebarOrganizationModeAtom,
+  type SidebarOrganizationMode,
 } from "./sidebarCollapsedAtoms";
 
 export default {
@@ -14,18 +16,21 @@ export default {
 function MenuStory({
   folderGroupingAvailable = true,
   groupBy,
+  organizationMode,
   sort,
 }: {
   folderGroupingAvailable?: boolean;
   groupBy: "none" | "folder";
+  organizationMode: SidebarOrganizationMode;
   sort: "updated" | "created" | "none";
 }) {
   const store = useMemo(() => {
     const next = createStore();
     next.set(sidebarChronologicalSortAtom, sort);
     next.set(sidebarGroupByAtom, groupBy);
+    next.set(sidebarOrganizationModeAtom, organizationMode);
     return next;
-  }, [groupBy, sort]);
+  }, [groupBy, organizationMode, sort]);
 
   return (
     <JotaiProvider store={store}>
@@ -42,17 +47,22 @@ function MenuStory({
 export function Overview() {
   return (
     <StoryCard>
-      <StoryRow label="default" hint="Updated at + Group by None">
-        <MenuStory sort="updated" groupBy="none" />
+      <StoryRow label="project" hint="organize by project">
+        <MenuStory sort="updated" groupBy="none" organizationMode="project" />
       </StoryRow>
-      <StoryRow label="manual folders" hint="Sort by None + Group by Folder">
-        <MenuStory sort="none" groupBy="folder" />
+      <StoryRow label="folders" hint="cross-project folder organization">
+        <MenuStory
+          sort="none"
+          groupBy="folder"
+          organizationMode="chronological"
+        />
       </StoryRow>
       <StoryRow label="no folders" hint="Folder option disabled">
         <MenuStory
           folderGroupingAvailable={false}
           sort="updated"
           groupBy="none"
+          organizationMode="project"
         />
       </StoryRow>
     </StoryCard>
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index 3a0fea4a4..bcccb7f76 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -43,6 +43,7 @@ import { titleCreatesFolder } from "@/components/sidebar/folderPath";
 import {
   sidebarFolderGroupingAutoEnabledAtom,
   sidebarGroupByAtom,
+  sidebarOrganizationModeAtom,
 } from "@/components/sidebar/sidebarCollapsedAtoms";
 import { getThreadReadToggleAction } from "@/components/sidebar/threadReadState";
 import { getRootComposeRoutePath, getThreadRoutePath } from "@/lib/route-paths";
@@ -104,6 +105,7 @@ export function ThreadActionsProvider({
   const updateThread = useUpdateThread();
   const systemConfigQuery = useSystemConfig();
   const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
+  const [, setOrganizationMode] = useAtom(sidebarOrganizationModeAtom);
   const [, setFolderGroupingAutoEnabled] = useAtom(
     sidebarFolderGroupingAutoEnabledAtom,
   );
@@ -165,6 +167,7 @@ export function ThreadActionsProvider({
           onSuccess: () => {
             if (titleCreatesFolder(title)) {
               setFolderGroupingAutoEnabled(true);
+              setOrganizationMode("chronological");
               if (groupBy === "none") {
                 setGroupBy("folder");
               }
@@ -179,6 +182,7 @@ export function ThreadActionsProvider({
       groupBy,
       setFolderGroupingAutoEnabled,
       setGroupBy,
+      setOrganizationMode,
       updateMutate,
     ],
   );

From 5c08aa2d76fbf7356e9894114384c3e926526368 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 23:21:07 -0700
Subject: [PATCH 12/54] Store sidebar folder paths explicitly

---
 apps/app/.ladle/story-fixtures.ts             |    2 +
 .../components/dialogs/ThreadRenameDialog.tsx |   20 +-
 .../ThreadMetadataContent.test.tsx            |    1 +
 .../sidebar/FolderGrouping.stories.tsx        |  146 +-
 .../src/components/sidebar/ProjectList.tsx    |  140 +-
 .../app/src/components/sidebar/ProjectRow.tsx |  140 +-
 .../sidebar/SidebarFolderRow.stories.tsx      |    6 -
 .../components/sidebar/SidebarFolderRow.tsx   |   14 +-
 .../sidebar/SidebarThreadSearchPanel.test.tsx |    1 +
 .../SidebarViewOptionsMenu.stories.tsx        |   33 +-
 .../src/components/sidebar/folderPath.test.ts |  121 +-
 apps/app/src/components/sidebar/folderPath.ts |   99 +-
 .../sidebar/pinnedSidebarThreads.test.ts      |   19 +-
 .../sidebar/pinnedSidebarThreads.ts           |    6 +-
 .../sidebar/projectThreadGroups.test.ts       |   76 +-
 .../components/sidebar/projectThreadGroups.ts |   52 +-
 .../sidebar/sidebarCollapsedAtoms.ts          |   23 +-
 .../thread/ThreadActionsProvider.tsx          |   33 +-
 .../thread-state-cache-owner.test.ts          |    1 +
 .../cache-owners/thread-state-cache-owner.ts  |   29 +-
 .../mutations/thread-state-mutations.test.tsx |   71 +
 .../hooks/mutations/thread-state-mutations.ts |    8 +-
 .../src/hooks/queries/query-helpers.test.ts   |    1 +
 .../hooks/threadMentionSuggestions.test.ts    |    1 +
 .../hooks/useForkThreadFromMessage.test.tsx   |    7 +-
 apps/app/src/lib/fork-thread-request.test.ts  |    1 +
 .../views/RootComposeMobileRecents.test.tsx   |    1 +
 apps/app/src/views/RootComposeView.test.ts    |    1 +
 .../ThreadDetailSecondaryContent.test.tsx     |    1 +
 .../threadParentSelectorOptions.test.ts       |    1 +
 apps/server/src/routes/threads/base.ts        |   17 +
 .../threads/thread-runtime-display.ts         |    1 +
 .../db/drizzle/0042_thread_folder_path.sql    |    1 +
 packages/db/drizzle/meta/0042_snapshot.json   | 2732 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    9 +-
 packages/db/src/data/threads.ts               |    6 +-
 packages/db/src/schema.ts                     |    1 +
 packages/db/test/data/threads.test.ts         |   26 +
 packages/domain/src/thread.ts                 |    1 +
 packages/server-contract/src/api/threads.ts   |    2 +
 .../server-contract/test/contract.test.ts     |    2 +
 41 files changed, 3222 insertions(+), 631 deletions(-)
 create mode 100644 packages/db/drizzle/0042_thread_folder_path.sql
 create mode 100644 packages/db/drizzle/meta/0042_snapshot.json

diff --git a/apps/app/.ladle/story-fixtures.ts b/apps/app/.ladle/story-fixtures.ts
index 476a66387..d84739c24 100644
--- a/apps/app/.ladle/story-fixtures.ts
+++ b/apps/app/.ladle/story-fixtures.ts
@@ -279,6 +279,7 @@ export function makeThread(overrides: Partial<Thread> = {}): Thread {
     providerId: "codex",
     title: "Audit recurring permission failures",
     titleFallback: "Audit recurring permission failures",
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
@@ -305,6 +306,7 @@ export function makeThreadListEntry(
     providerId: "codex",
     title: "Audit recurring permission failures",
     titleFallback: "Audit recurring permission failures",
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
index 843b5f09d..ad9025dcf 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
@@ -10,7 +10,10 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog.js";
 import { Input } from "@/components/ui/input.js";
-import { titleCreatesFolder } from "@/components/sidebar/folderPath";
+import {
+  parseThreadFolderShortcut,
+  titleCreatesFolder,
+} from "@/components/sidebar/folderPath";
 import { useNameValidation } from "./useNameValidation.js";
 import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
 
@@ -19,11 +22,16 @@ export interface ThreadRenameDialogTarget {
   currentTitle: string;
 }
 
+export interface ThreadRenameDialogPayload {
+  title: string;
+  folderPath?: string | null;
+}
+
 interface ThreadRenameDialogProps {
   target: ThreadRenameDialogTarget | null;
   pending?: boolean;
   onOpenChange: (open: boolean) => void;
-  onRename: (threadId: string, title: string) => void;
+  onRename: (threadId: string, payload: ThreadRenameDialogPayload) => void;
 }
 
 export function ThreadRenameDialog({
@@ -53,7 +61,7 @@ export function ThreadRenameDialog({
 export interface ThreadRenameDialogContentProps {
   target: ThreadRenameDialogTarget;
   pending: boolean;
-  onRename: (threadId: string, title: string) => void;
+  onRename: (threadId: string, payload: ThreadRenameDialogPayload) => void;
   inputRef: RefObject<HTMLInputElement | null>;
 }
 
@@ -78,7 +86,11 @@ export function ThreadRenameDialogContent({
     const trimmedTitle = validate(nextTitle);
     if (trimmedTitle === null) return;
 
-    onRename(target.id, trimmedTitle);
+    const folderShortcut = parseThreadFolderShortcut(trimmedTitle);
+    onRename(
+      target.id,
+      folderShortcut.folderPath ? folderShortcut : { title: trimmedTitle },
+    );
   };
 
   return (
diff --git a/apps/app/src/components/secondary-panel/ThreadMetadataContent.test.tsx b/apps/app/src/components/secondary-panel/ThreadMetadataContent.test.tsx
index 78a4a6f51..a301569ed 100644
--- a/apps/app/src/components/secondary-panel/ThreadMetadataContent.test.tsx
+++ b/apps/app/src/components/secondary-panel/ThreadMetadataContent.test.tsx
@@ -14,6 +14,7 @@ function makeThread(overrides: Partial<Thread> = {}): Thread {
     providerId: "codex",
     title: null,
     titleFallback: null,
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
diff --git a/apps/app/src/components/sidebar/FolderGrouping.stories.tsx b/apps/app/src/components/sidebar/FolderGrouping.stories.tsx
index a02597678..2e8bc74d5 100644
--- a/apps/app/src/components/sidebar/FolderGrouping.stories.tsx
+++ b/apps/app/src/components/sidebar/FolderGrouping.stories.tsx
@@ -1,5 +1,4 @@
-import { useMemo, type ReactNode } from "react";
-import { createStore, Provider as JotaiProvider } from "jotai";
+import type { ReactNode } from "react";
 import type { ThreadListEntry } from "@bb/domain";
 import {
   PROJECT_IDS,
@@ -15,14 +14,6 @@ import {
   type ProjectThreadListState,
 } from "./ProjectRow";
 import { compareStandardThreads } from "./projectThreadGroups";
-import {
-  sidebarChronologicalSortAtom,
-  sidebarGroupByAtom,
-  sidebarManualOrderAtom,
-  type SidebarChronologicalSort,
-  type SidebarGroupBy,
-  type SidebarManualOrder,
-} from "./sidebarCollapsedAtoms";
 
 export default {
   title: "sidebar/Folder grouping",
@@ -42,32 +33,37 @@ function makeThread(overrides: Partial<ThreadListEntry>): ThreadListEntry {
 const folderThreads: ThreadListEntry[] = [
   makeThread({
     id: "thr_work_plan",
-    title: "Work/Q3/Plan",
+    title: "Plan",
+    folderPath: "Work/Q3",
     latestAttentionAt: 90,
     createdAt: 90,
   }),
   makeThread({
     id: "thr_work_notes",
-    title: "Work/Q3/Notes",
+    title: "Notes",
+    folderPath: "Work/Q3",
     latestAttentionAt: 80,
     createdAt: 80,
   }),
   makeThread({
     id: "thr_work_parent",
-    title: "Work/Q4/Kickoff",
+    title: "Kickoff",
+    folderPath: "Work/Q4",
     latestAttentionAt: 70,
     createdAt: 70,
   }),
   makeThread({
     id: "thr_work_child",
     parentThreadId: "thr_work_parent",
-    title: "Ignored/Child/Path",
+    title: "Child path stays literal / not a folder",
+    folderPath: "Ignored/Child",
     latestAttentionAt: 65,
     createdAt: 65,
   }),
   makeThread({
     id: "thr_personal_plan",
-    title: "Personal/Q3/Plan",
+    title: "Plan",
+    folderPath: "Personal/Q3",
     latestAttentionAt: 60,
     createdAt: 60,
   }),
@@ -79,7 +75,8 @@ const folderThreads: ThreadListEntry[] = [
   }),
   makeThread({
     id: "thr_env_a",
-    title: "Work/Build/Daemon",
+    title: "Daemon",
+    folderPath: "Work/Build",
     environmentId: "env_story_folder",
     environmentName: "Folder build",
     environmentBranchName: "bb/sidebar-folders",
@@ -89,7 +86,8 @@ const folderThreads: ThreadListEntry[] = [
   }),
   makeThread({
     id: "thr_env_b",
-    title: "Work/Build/Stories",
+    title: "Stories",
+    folderPath: "Work/Build",
     environmentId: "env_story_folder",
     environmentName: "Folder build",
     environmentBranchName: "bb/sidebar-folders",
@@ -100,65 +98,15 @@ const folderThreads: ThreadListEntry[] = [
   }),
 ];
 
-const manualThreads: ThreadListEntry[] = [
-  makeThread({ id: "thr_a", title: "Work/Q3/Plan", latestAttentionAt: 90 }),
-  makeThread({ id: "thr_b", title: "Work/Q3/Notes", latestAttentionAt: 80 }),
-  makeThread({ id: "thr_c", title: "Work/Q4/Kickoff", latestAttentionAt: 70 }),
-  makeThread({ id: "thr_d", title: "Personal/Plan", latestAttentionAt: 60 }),
-  makeThread({ id: "thr_e", title: "Loose thread", latestAttentionAt: 50 }),
-];
-
-const manualOrder: SidebarManualOrder = {
-  [PROJECT_ID]: ["thr_e", `${PROJECT_ID}::Personal`, `${PROJECT_ID}::Work`],
-  [`${PROJECT_ID}::Work`]: [`${PROJECT_ID}::Work/Q4`, `${PROJECT_ID}::Work/Q3`],
-  [`${PROJECT_ID}::Work/Q3`]: ["thr_b", "thr_a"],
-};
-
-function SidebarState({
-  children,
-  groupBy,
-  manualOrder,
-  sort = "updated",
-}: {
-  children: ReactNode;
-  groupBy: SidebarGroupBy;
-  manualOrder?: SidebarManualOrder;
-  sort?: SidebarChronologicalSort;
-}) {
-  const store = useMemo(() => {
-    const next = createStore();
-    next.set(sidebarGroupByAtom, groupBy);
-    next.set(sidebarChronologicalSortAtom, sort);
-    if (manualOrder) {
-      next.set(sidebarManualOrderAtom, manualOrder);
-    }
-    return next;
-  }, [groupBy, manualOrder, sort]);
-
-  return <JotaiProvider store={store}>{children}</JotaiProvider>;
-}
-
-function SidebarStage({
-  children,
-  groupBy,
-  manualOrder,
-  sort,
-}: {
-  children: ReactNode;
-  groupBy: SidebarGroupBy;
-  manualOrder?: SidebarManualOrder;
-  sort?: SidebarChronologicalSort;
-}) {
+function SidebarStage({ children }: { children: ReactNode }) {
   return (
-    <SidebarState groupBy={groupBy} sort={sort} manualOrder={manualOrder}>
-      <ProjectActionsProvider>
-        <ThreadActionsProvider>
-          <div className="w-full max-w-[460px] min-w-0 rounded-md bg-sidebar p-2 text-sidebar-foreground">
-            <SidebarStickyStack>{children}</SidebarStickyStack>
-          </div>
-        </ThreadActionsProvider>
-      </ProjectActionsProvider>
-    </SidebarState>
+    <ProjectActionsProvider>
+      <ThreadActionsProvider>
+        <div className="w-full max-w-[460px] min-w-0 rounded-md bg-sidebar p-2 text-sidebar-foreground">
+          <SidebarStickyStack>{children}</SidebarStickyStack>
+        </div>
+      </ThreadActionsProvider>
+    </ProjectActionsProvider>
   );
 }
 
@@ -183,14 +131,11 @@ function ProjectTree({ threads }: { threads: readonly ThreadListEntry[] }) {
   );
 }
 
-export function NoneVsFolder() {
+export function ProjectFolders() {
   return (
-    <StoryCard columns={["None", "Folder"]} labelWidth="160px">
-      <StoryRow label="same data">
-        <SidebarStage groupBy="none">
-          <ProjectTree threads={folderThreads} />
-        </SidebarStage>
-        <SidebarStage groupBy="folder">
+    <StoryCard>
+      <StoryRow label="project" hint="stored folderPath groups project threads">
+        <SidebarStage>
           <ProjectTree threads={folderThreads} />
         </SidebarStage>
       </StoryRow>
@@ -203,9 +148,9 @@ export function ChronologicalFolders() {
     <StoryCard>
       <StoryRow
         label="all threads"
-        hint="folder grouping in chronological mode"
+        hint="stored folderPath groups matching paths across projects"
       >
-        <SidebarStage groupBy="folder">
+        <SidebarStage>
           <ChronologicalThreadTree
             threadListState={projectTree(folderThreads)}
             compareThreads={compareStandardThreads}
@@ -219,36 +164,3 @@ export function ChronologicalFolders() {
     </StoryCard>
   );
 }
-
-export function ManualOrder() {
-  return (
-    <StoryCard>
-      <StoryRow
-        label="Sort: None"
-        hint="manual list interleaves loose threads and folders"
-      >
-        <SidebarStage groupBy="folder" sort="none" manualOrder={manualOrder}>
-          <ProjectTree threads={manualThreads} />
-        </SidebarStage>
-      </StoryRow>
-    </StoryCard>
-  );
-}
-
-export function CrossFolderRefile() {
-  const afterThreads = manualThreads.map((thread) =>
-    thread.id === "thr_a" ? { ...thread, title: "Personal/Plan" } : thread,
-  );
-  return (
-    <StoryCard columns={["Before", "After"]} labelWidth="160px">
-      <StoryRow label="drop into Personal">
-        <SidebarStage groupBy="folder" sort="none">
-          <ProjectTree threads={manualThreads} />
-        </SidebarStage>
-        <SidebarStage groupBy="folder" sort="none">
-          <ProjectTree threads={afterThreads} />
-        </SidebarStage>
-      </StoryRow>
-    </StoryCard>
-  );
-}
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index e91edab29..cd7b974e8 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -70,7 +70,6 @@ import type { ProjectThreadListState } from "./ProjectRow";
 import {
   compareByCreatedAtDescending,
   compareStandardThreads,
-  isSidebarProjectThread,
   type ThreadComparator,
 } from "./projectThreadGroups";
 import {
@@ -91,15 +90,13 @@ import {
   DEFAULT_SIDEBAR_SECTION_ORDER,
   sidebarChronologicalSortAtom,
   sidebarCollapsedFoldersAtom,
-  sidebarFolderGroupingAutoEnabledAtom,
-  sidebarGroupByAtom,
   sidebarOrganizationModeAtom,
   sidebarSectionOrderAtom,
   type CollapsibleSidebarSectionId,
   type SidebarOrganizationMode,
   type SidebarSectionId,
 } from "./sidebarCollapsedAtoms";
-import { folderAncestorKeys, titleCreatesFolder } from "./folderPath";
+import { folderAncestorKeys } from "./folderPath";
 import {
   CHRONOLOGICAL_CONTAINER_ID,
   PINNED_CONTAINER_ID,
@@ -177,7 +174,6 @@ interface ProjectListThreadsSectionActionsProps {
 }
 
 interface SidebarViewOptionsMenuProps {
-  folderGroupingAvailable?: boolean;
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
@@ -506,7 +502,6 @@ function SidebarOrganizeMenuOption({
 // headers. The organization mode is global, so either header's menu drives the
 // whole sidebar.
 export function SidebarViewOptionsMenu({
-  folderGroupingAvailable = true,
   open,
   onOpenChange,
   onOrganizationModeSelect,
@@ -517,10 +512,6 @@ export function SidebarViewOptionsMenu({
   const [chronologicalSort, setChronologicalSort] = useAtom(
     sidebarChronologicalSortAtom,
   );
-  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-  const setFolderGroupingAutoEnabled = useSetAtom(
-    sidebarFolderGroupingAutoEnabledAtom,
-  );
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
@@ -550,42 +541,19 @@ export function SidebarViewOptionsMenu({
         </SidebarOrganizeMenuSectionLabel>
         <SidebarOrganizeMenuOption
           label="Project"
-          selected={organizationMode === "project" && groupBy === "none"}
+          selected={organizationMode === "project"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("project");
-            setGroupBy("none");
-            if (folderGroupingAvailable) {
-              setFolderGroupingAutoEnabled(true);
-            }
             onOrganizationModeSelect?.("project");
           }}
         />
-        <SidebarOrganizeMenuOption
-          label="Folder"
-          disabled={!folderGroupingAvailable}
-          selected={groupBy === "folder"}
-          onSelect={(event) => {
-            event.preventDefault();
-            if (!folderGroupingAvailable) {
-              return;
-            }
-            setOrganizationMode("chronological");
-            setGroupBy("folder");
-            setFolderGroupingAutoEnabled(true);
-            onOrganizationModeSelect?.("chronological");
-          }}
-        />
         <SidebarOrganizeMenuOption
           label="None"
-          selected={organizationMode === "chronological" && groupBy === "none"}
+          selected={organizationMode === "chronological"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("chronological");
-            setGroupBy("none");
-            if (folderGroupingAvailable) {
-              setFolderGroupingAutoEnabled(true);
-            }
             onOrganizationModeSelect?.("chronological");
           }}
         />
@@ -609,14 +577,6 @@ export function SidebarViewOptionsMenu({
             setChronologicalSort("created");
           }}
         />
-        <SidebarOrganizeMenuOption
-          label="None"
-          selected={chronologicalSort === "none"}
-          onSelect={(event) => {
-            event.preventDefault();
-            setChronologicalSort("none");
-          }}
-        />
       </DropdownMenuContent>
     </DropdownMenu>
   );
@@ -1030,15 +990,6 @@ function ProjectListComponent({
     }
     return map;
   }, [threads]);
-  const folderGroupingAvailable = useMemo(
-    () =>
-      threads.some(
-        (thread) =>
-          isSidebarProjectThread(thread) &&
-          titleCreatesFolder(thread.title ?? ""),
-      ),
-    [threads],
-  );
   const projectsState = useConnectionAwareQueryState({
     hasResolvedData: projects !== undefined,
     isFetching: sidebarNavigationQuery.isFetching,
@@ -1215,14 +1166,11 @@ function ProjectListComponent({
     },
     [],
   );
-  const [organizationMode, setOrganizationMode] = useAtom(
-    sidebarOrganizationModeAtom,
-  );
-  const [chronologicalSort] = useAtom(sidebarChronologicalSortAtom);
-  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-  const [folderGroupingAutoEnabled, setFolderGroupingAutoEnabled] = useAtom(
-    sidebarFolderGroupingAutoEnabledAtom,
+  const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
+  const [chronologicalSort, setChronologicalSort] = useAtom(
+    sidebarChronologicalSortAtom,
   );
+  const groupBy = "folder" as const;
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
@@ -1280,34 +1228,11 @@ function ProjectListComponent({
     normalizedCollapsedSidebarSectionIds,
     setCollapsedSidebarSectionIdList,
   ]);
-  // Existing slash-titled threads may predate folder grouping. Auto-enable once
-  // so refreshes render those titles as folders, then mark it handled so a
-  // later explicit "None" choice sticks.
   useEffect(() => {
-    if (!folderGroupingAvailable || folderGroupingAutoEnabled) {
-      return;
+    if (chronologicalSort === "none") {
+      setChronologicalSort("updated");
     }
-    if (groupBy === "folder") {
-      if (organizationMode !== "chronological") {
-        setOrganizationMode("chronological");
-      }
-      setFolderGroupingAutoEnabled(true);
-      return;
-    }
-    if (organizationMode !== "chronological") {
-      setOrganizationMode("chronological");
-    }
-    setGroupBy("folder");
-    setFolderGroupingAutoEnabled(true);
-  }, [
-    folderGroupingAutoEnabled,
-    folderGroupingAvailable,
-    groupBy,
-    organizationMode,
-    setFolderGroupingAutoEnabled,
-    setGroupBy,
-    setOrganizationMode,
-  ]);
+  }, [chronologicalSort, setChronologicalSort]);
   const pinnedSidebarState = useMemo(
     () => buildPinnedSidebarState({ threads, groupBy }),
     [threads, groupBy],
@@ -1364,30 +1289,26 @@ function ProjectListComponent({
       removeCollapsedIds(current, environmentIdsToExpand),
     );
 
-    // Under Group by: Folder, also un-collapse the folder ancestors hiding the
-    // selected thread. Folders derive from the TOP-LEVEL bucketed thread's
-    // title, not the selected child's own (a child's "/" is ignored) — so in
+    // Also un-collapse folder ancestors hiding the selected thread. In
     // project/pinned mode use the top-level ancestor the walk above ended on;
     // in the flat chronological list the selected thread is itself top-level.
-    if (groupBy === "folder") {
-      const isPinned =
-        pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
-      const isChronological = !isPinned && organizationMode === "chronological";
-      const topLevelAncestor = currentThread ?? selectedThread;
-      const folderSource = isChronological ? selectedThread : topLevelAncestor;
-      const folderContainerId = isPinned
-        ? PINNED_CONTAINER_ID
-        : isChronological
-          ? CHRONOLOGICAL_CONTAINER_ID
-          : selectedThread.projectId;
-      const folderKeysToExpand = new Set(
-        folderAncestorKeys(folderContainerId, folderSource.title ?? ""),
+    const isPinned =
+      pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
+    const isChronological = !isPinned && organizationMode === "chronological";
+    const topLevelAncestor = currentThread ?? selectedThread;
+    const folderSource = isChronological ? selectedThread : topLevelAncestor;
+    const folderContainerId = isPinned
+      ? PINNED_CONTAINER_ID
+      : isChronological
+        ? CHRONOLOGICAL_CONTAINER_ID
+        : selectedThread.projectId;
+    const folderKeysToExpand = new Set(
+      folderAncestorKeys(folderContainerId, folderSource.folderPath),
+    );
+    if (folderKeysToExpand.size > 0) {
+      setCollapsedFolderList((current) =>
+        removeCollapsedIds(current, folderKeysToExpand),
       );
-      if (folderKeysToExpand.size > 0) {
-        setCollapsedFolderList((current) =>
-          removeCollapsedIds(current, folderKeysToExpand),
-        );
-      }
     }
 
     if (pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId)) {
@@ -1408,7 +1329,6 @@ function ProjectListComponent({
       removeCollapsedIds(current, new Set(["projects"])),
     );
   }, [
-    groupBy,
     organizationMode,
     pinnedSidebarState.effectivePinnedThreadIds,
     selectedThreadId,
@@ -1644,7 +1564,6 @@ function ProjectListComponent({
   const projectsSectionActions = (
     <>
       <SidebarViewOptionsMenu
-        folderGroupingAvailable={folderGroupingAvailable}
         open={isProjectsViewOptionsMenuOpen}
         onOpenChange={handleProjectsViewOptionsMenuOpenChange}
         onOrganizationModeSelect={
@@ -1669,7 +1588,6 @@ function ProjectListComponent({
         onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
       />
       <SidebarViewOptionsMenu
-        folderGroupingAvailable={folderGroupingAvailable}
         open={isThreadsViewOptionsMenuOpen}
         onOpenChange={handleThreadsViewOptionsMenuOpenChange}
       />
@@ -1704,7 +1622,7 @@ function ProjectListComponent({
     );
   }
 
-  if (organizationMode === "chronological" || groupBy === "folder") {
+  if (organizationMode === "chronological") {
     return (
       <ProjectListShell>
         <div className="space-y-4">
@@ -1714,7 +1632,7 @@ function ProjectListComponent({
             </TopLevelSidebarSection>
           ) : null}
           <TopLevelSidebarSection
-            label={groupBy === "folder" ? "Folders" : "All Threads"}
+            label="All Threads"
             actions={threadsSectionActions}
             actionsOpen={
               isThreadsActionsMenuOpen || isThreadsViewOptionsMenuOpen
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index a3745d03d..ba7dd5881 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -84,17 +84,11 @@ import {
 } from "./projectThreadGroups";
 import { SidebarFolderRow } from "./SidebarFolderRow";
 import {
-  buildThreadTitleForFolderPath,
   formatFolderPathLabel,
-  parseThreadFolderPath,
+  normalizeFolderPath,
+  splitFolderPath,
 } from "./folderPath";
-import {
-  sidebarChronologicalSortAtom,
-  sidebarCollapsedFoldersAtom,
-  sidebarGroupByAtom,
-  sidebarManualOrderAtom,
-  type SidebarManualOrder,
-} from "./sidebarCollapsedAtoms";
+import { sidebarCollapsedFoldersAtom } from "./sidebarCollapsedAtoms";
 import {
   SIDEBAR_PROJECT_GROUP_LINE_CLASS,
   SIDEBAR_ROW_BASE_CLASS,
@@ -339,37 +333,14 @@ function collectManualThreadTreeLookup(
   return lookup;
 }
 
-function moveIdBefore({
-  activeId,
-  itemIds,
-  overId,
-}: {
-  activeId: string;
-  itemIds: readonly string[];
-  overId: string | null;
-}): string[] {
-  const withoutActive = itemIds.filter((id) => id !== activeId);
-  const insertIndex =
-    overId === null ? withoutActive.length : withoutActive.indexOf(overId);
-  if (insertIndex === -1) {
-    return [...itemIds];
-  }
-  return [
-    ...withoutActive.slice(0, insertIndex),
-    activeId,
-    ...withoutActive.slice(insertIndex),
-  ];
-}
-
-function writeManualOrderLists(
-  current: SidebarManualOrder,
-  updates: ReadonlyMap<string, readonly string[]>,
-): SidebarManualOrder {
-  const next = { ...current };
-  for (const [parentKey, itemIds] of updates) {
-    next[parentKey] = [...itemIds];
-  }
-  return next;
+function hasFolderItems(items: readonly ProjectThreadItem[]): boolean {
+  return items.some(
+    (item) =>
+      item.kind === "folder" ||
+      (item.kind === "thread" && hasFolderItems(item.node.children)) ||
+      (item.kind === "environment" &&
+        item.group.nodes.some((node) => hasFolderItems(node.children))),
+  );
 }
 
 function useManualThreadTreeDnd({
@@ -381,7 +352,6 @@ function useManualThreadTreeDnd({
     () => collectManualThreadTreeLookup(rootItems, containerId),
     [containerId, rootItems],
   );
-  const setManualOrder = useSetAtom(sidebarManualOrderAtom);
   const updateThread = useUpdateThread();
 
   const handleDragEnd = useCallback(
@@ -405,7 +375,6 @@ function useManualThreadTreeDnd({
       const overKind = lookup.itemKindById.get(overId);
       const fromParentKey = lookup.parentKeyByItemId.get(activeId);
       let toParentKey = lookup.parentKeyByItemId.get(overId);
-      let destinationOverId: string | null = overId;
 
       if (!activeKind || !overKind || !fromParentKey || !toParentKey) {
         return;
@@ -414,48 +383,8 @@ function useManualThreadTreeDnd({
       // Dropping a thread on a folder header means "move into this folder".
       if (activeKind === "thread" && overKind === "folder") {
         toParentKey = overId;
-        destinationOverId = null;
-      }
-
-      // Folders can be reordered among siblings, but they are not folder
-      // entities and cannot be re-filed into other folders.
-      if (activeKind === "folder" && fromParentKey !== toParentKey) {
-        return;
-      }
-
-      const sourceIds = lookup.itemIdsByParentKey.get(fromParentKey);
-      const destinationIds = lookup.itemIdsByParentKey.get(toParentKey);
-      if (!sourceIds || !destinationIds) {
-        return;
-      }
-
-      const updates = new Map<string, readonly string[]>();
-      if (fromParentKey === toParentKey) {
-        updates.set(
-          fromParentKey,
-          moveIdBefore({
-            activeId,
-            itemIds: sourceIds,
-            overId: destinationOverId,
-          }),
-        );
-      } else {
-        updates.set(
-          fromParentKey,
-          sourceIds.filter((id) => id !== activeId),
-        );
-        updates.set(
-          toParentKey,
-          moveIdBefore({
-            activeId,
-            itemIds: destinationIds,
-            overId: destinationOverId,
-          }),
-        );
       }
 
-      setManualOrder((current) => writeManualOrderLists(current, updates));
-
       if (activeKind !== "thread" || fromParentKey === toParentKey) {
         return;
       }
@@ -463,15 +392,12 @@ function useManualThreadTreeDnd({
       const thread = lookup.threadByItemId.get(activeId);
       if (!thread) return;
 
-      const destinationFolders =
-        lookup.folderPathByParentKey.get(toParentKey) ?? [];
-      const title = buildThreadTitleForFolderPath(
-        thread.title ?? getThreadDisplayTitle(thread),
-        destinationFolders,
+      const destinationFolderPath = normalizeFolderPath(
+        (lookup.folderPathByParentKey.get(toParentKey) ?? []).join("/"),
       );
-      updateThread.mutate({ id: activeId, title });
+      updateThread.mutate({ id: activeId, folderPath: destinationFolderPath });
     },
-    [enabled, lookup, setManualOrder, updateThread],
+    [enabled, lookup, updateThread],
   );
 
   const { consumeClickSuppression, dndContextProps, onClickCapture } =
@@ -1351,7 +1277,6 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
         name={folder.name}
         pathLabel={formatFolderPathLabel(folder.path)}
         depth={headerDepth}
-        threadCount={folder.threadCount}
         activity={folder.activity}
         consumeClickSuppression={consumeClickSuppression}
         dragBindings={dragBindings}
@@ -1456,12 +1381,14 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
     if (!insideFolder) {
       return undefined;
     }
-    const { folders, leaf } = parseThreadFolderPath(node.thread.title ?? "");
+    const title = getThreadDisplayTitle(node.thread);
+    const folders = splitFolderPath(node.thread.folderPath);
     return {
-      displayTitle: leaf || undefined,
-      accessibleTitle: formatFolderPathLabel([...folders, leaf]) || undefined,
+      displayTitle: title,
+      accessibleTitle:
+        folders.length > 0 ? formatFolderPathLabel([...folders, title]) : title,
     };
-  }, [insideFolder, node.thread.title]);
+  }, [insideFolder, node.thread]);
   const row = (
     <ThreadRow
       projectId={projectId}
@@ -1522,9 +1449,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ProjectThreadTreeProps) {
-  const groupBy = useAtomValue(sidebarGroupByAtom);
-  const chronologicalSort = useAtomValue(sidebarChronologicalSortAtom);
-  const manualOrder = useAtomValue(sidebarManualOrderAtom);
+  const groupBy = "folder" as const;
   const projectThreads =
     threadListState.status === "ready"
       ? threadListState.threads
@@ -1534,20 +1459,12 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
       buildProjectThreadGroups(projectThreads, compareThreads, {
         groupBy,
         containerId: projectId,
-        manualOrder: chronologicalSort === "none" ? manualOrder : undefined,
       }),
-    [
-      chronologicalSort,
-      compareThreads,
-      projectThreads,
-      groupBy,
-      manualOrder,
-      projectId,
-    ],
+    [compareThreads, projectThreads, groupBy, projectId],
   );
   const manualSort = useManualThreadTreeDnd({
     containerId: projectId,
-    enabled: chronologicalSort === "none",
+    enabled: hasFolderItems(rootItems),
     rootItems,
   });
 
@@ -1635,9 +1552,7 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ChronologicalThreadTreeProps) {
-  const groupBy = useAtomValue(sidebarGroupByAtom);
-  const chronologicalSort = useAtomValue(sidebarChronologicalSortAtom);
-  const manualOrder = useAtomValue(sidebarManualOrderAtom);
+  const groupBy = "folder" as const;
   const threads =
     threadListState.status === "ready"
       ? threadListState.threads
@@ -1647,13 +1562,12 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
       buildChronologicalThreadList(threads, compareThreads, {
         groupBy,
         containerId: CHRONOLOGICAL_CONTAINER_ID,
-        manualOrder: chronologicalSort === "none" ? manualOrder : undefined,
       }),
-    [chronologicalSort, threads, compareThreads, groupBy, manualOrder],
+    [threads, compareThreads, groupBy],
   );
   const manualSort = useManualThreadTreeDnd({
     containerId: CHRONOLOGICAL_CONTAINER_ID,
-    enabled: chronologicalSort === "none",
+    enabled: hasFolderItems(rootItems),
     rootItems,
   });
 
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
index b44e068f9..5d1d2aeb6 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
@@ -38,7 +38,6 @@ export function Overview() {
             name="Work"
             pathLabel="Work"
             depth={0}
-            threadCount={3}
             activity={activity()}
             isCollapsed={false}
             onToggleCollapsed={noop}
@@ -51,7 +50,6 @@ export function Overview() {
             name="Q3"
             pathLabel="Work / Q3"
             depth={1}
-            threadCount={2}
             activity={activity({ unread: true })}
             isCollapsed
             onToggleCollapsed={noop}
@@ -64,7 +62,6 @@ export function Overview() {
             name="Build"
             pathLabel="Work / Build"
             depth={2}
-            threadCount={4}
             activity={activity({ working: true })}
             isCollapsed
             onToggleCollapsed={noop}
@@ -77,7 +74,6 @@ export function Overview() {
             name="Reviews"
             pathLabel="Work / Reviews"
             depth={3}
-            threadCount={6}
             activity={activity({ pending: true, unread: true })}
             isCollapsed
             onToggleCollapsed={noop}
@@ -90,7 +86,6 @@ export function Overview() {
             name="Very long customer migration and rollout folder"
             pathLabel="Clients / Very long customer migration and rollout folder"
             depth={1}
-            threadCount={12}
             activity={activity()}
             isCollapsed={false}
             onToggleCollapsed={noop}
@@ -103,7 +98,6 @@ export function Overview() {
             name="Fifth level"
             pathLabel="A / B / C / D / Fifth level"
             depth={5}
-            threadCount={1}
             activity={activity()}
             isCollapsed={false}
             onToggleCollapsed={noop}
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index fdf9f135b..98ffdb9f5 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -36,7 +36,6 @@ interface SidebarFolderRowProps {
   pathLabel: string;
   // Render depth (folder nesting + section offset); drives indentation.
   depth: number;
-  threadCount: number;
   activity: CollapsedChildActivity;
   isCollapsed: boolean;
   onToggleCollapsed: () => void;
@@ -46,15 +45,13 @@ interface SidebarFolderRowProps {
   dragBindings?: SidebarSortableDragBindings;
 }
 
-// The "Work › Q3 (2)" disclosure header for a derived folder. Not a thread:
-// clicking toggles collapse, there is no navigation. Mirrors the parent-thread
-// and worktree-header chrome (leading icon, truncating name, chevron, and a
-// rolled-up activity glyph while collapsed).
+// The "Work › Q3" disclosure header for a folder. Not a thread: clicking
+// toggles collapse, there is no navigation. It stays visually quieter than a
+// project row while still mirroring parent-thread disclosure behavior.
 function SidebarFolderRowComponent({
   name,
   pathLabel,
   depth,
-  threadCount,
   activity,
   consumeClickSuppression,
   dragBindings,
@@ -115,10 +112,7 @@ function SidebarFolderRowComponent({
         />
       </span>
       <span className="relative z-10 flex min-w-0 flex-1 items-center gap-1.5 text-left">
-        <span className="min-w-0 truncate font-medium">{name}</span>
-        <span className="shrink-0 text-xs tabular-nums text-subtle-foreground/70">
-          {threadCount}
-        </span>
+        <span className="min-w-0 truncate">{name}</span>
         <SidebarChildToggleChevron
           isCollapsed={isCollapsed}
           expandLabel={`Expand ${pathLabel} folder`}
diff --git a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
index f4ad0ed97..0bd2053dc 100644
--- a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
+++ b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
@@ -60,6 +60,7 @@ function createThreadListEntry({
     status: "idle",
     title,
     titleFallback: null,
+    folderPath: null,
     updatedAt: 1000,
   };
 }
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 1b99271c5..9580ee4b0 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -4,7 +4,6 @@ import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import { SidebarViewOptionsMenu } from "./ProjectList";
 import {
   sidebarChronologicalSortAtom,
-  sidebarGroupByAtom,
   sidebarOrganizationModeAtom,
   type SidebarOrganizationMode,
 } from "./sidebarCollapsedAtoms";
@@ -14,31 +13,23 @@ export default {
 };
 
 function MenuStory({
-  folderGroupingAvailable = true,
-  groupBy,
   organizationMode,
   sort,
 }: {
-  folderGroupingAvailable?: boolean;
-  groupBy: "none" | "folder";
   organizationMode: SidebarOrganizationMode;
-  sort: "updated" | "created" | "none";
+  sort: "updated" | "created";
 }) {
   const store = useMemo(() => {
     const next = createStore();
     next.set(sidebarChronologicalSortAtom, sort);
-    next.set(sidebarGroupByAtom, groupBy);
     next.set(sidebarOrganizationModeAtom, organizationMode);
     return next;
-  }, [groupBy, organizationMode, sort]);
+  }, [organizationMode, sort]);
 
   return (
     <JotaiProvider store={store}>
       <div className="relative flex h-72 w-80 items-start justify-end rounded-md bg-sidebar p-4 text-sidebar-foreground">
-        <SidebarViewOptionsMenu
-          folderGroupingAvailable={folderGroupingAvailable}
-          open
-        />
+        <SidebarViewOptionsMenu open />
       </div>
     </JotaiProvider>
   );
@@ -48,22 +39,10 @@ export function Overview() {
   return (
     <StoryCard>
       <StoryRow label="project" hint="organize by project">
-        <MenuStory sort="updated" groupBy="none" organizationMode="project" />
+        <MenuStory sort="updated" organizationMode="project" />
       </StoryRow>
-      <StoryRow label="folders" hint="cross-project folder organization">
-        <MenuStory
-          sort="none"
-          groupBy="folder"
-          organizationMode="chronological"
-        />
-      </StoryRow>
-      <StoryRow label="no folders" hint="Folder option disabled">
-        <MenuStory
-          folderGroupingAvailable={false}
-          sort="updated"
-          groupBy="none"
-          organizationMode="project"
-        />
+      <StoryRow label="none" hint="cross-project chronological view">
+        <MenuStory sort="created" organizationMode="chronological" />
       </StoryRow>
     </StoryCard>
   );
diff --git a/apps/app/src/components/sidebar/folderPath.test.ts b/apps/app/src/components/sidebar/folderPath.test.ts
index 83ae5b5cf..86bcd2141 100644
--- a/apps/app/src/components/sidebar/folderPath.test.ts
+++ b/apps/app/src/components/sidebar/folderPath.test.ts
@@ -1,73 +1,63 @@
 import { describe, expect, it } from "vitest";
 import {
   buildFolderKey,
-  buildThreadTitleForFolderPath,
   folderAncestorKeys,
-  normalizeThreadTitle,
-  parseThreadFolderPath,
+  normalizeFolderPath,
+  parseThreadFolderShortcut,
+  splitFolderPath,
   titleCreatesFolder,
 } from "./folderPath";
 
-describe("parseThreadFolderPath", () => {
+describe("splitFolderPath", () => {
   it("splits on '/', trims segments, and drops empties", () => {
-    expect(parseThreadFolderPath("Work/Q3/Plan")).toEqual({
-      folders: ["Work", "Q3"],
-      leaf: "Plan",
-    });
-  });
-
-  it("treats a single segment as a leaf with no folder", () => {
-    expect(parseThreadFolderPath("Standalone")).toEqual({
-      folders: [],
-      leaf: "Standalone",
-    });
-  });
-
-  it("collapses leading, trailing, and doubled slashes", () => {
-    expect(parseThreadFolderPath("/Work//Q3/")).toEqual({
-      folders: ["Work"],
-      leaf: "Q3",
-    });
+    expect(splitFolderPath("Work/Q3")).toEqual(["Work", "Q3"]);
+    expect(splitFolderPath("/Work//Q3/")).toEqual(["Work", "Q3"]);
+    expect(splitFolderPath(" Work / Q3 ")).toEqual(["Work", "Q3"]);
   });
 
-  it("trims whitespace around each segment", () => {
-    expect(parseThreadFolderPath("Work / Q3 ")).toEqual({
-      folders: ["Work"],
-      leaf: "Q3",
-    });
-  });
-
-  it("yields an empty path for an all-slashes or empty title", () => {
-    expect(parseThreadFolderPath("///")).toEqual({ folders: [], leaf: "" });
-    expect(parseThreadFolderPath("")).toEqual({ folders: [], leaf: "" });
+  it("returns an empty path for nullish or empty values", () => {
+    expect(splitFolderPath(null)).toEqual([]);
+    expect(splitFolderPath(undefined)).toEqual([]);
+    expect(splitFolderPath("///")).toEqual([]);
+    expect(splitFolderPath("")).toEqual([]);
   });
 });
 
-describe("normalizeThreadTitle", () => {
-  it("re-joins normalized segments with '/'", () => {
-    expect(normalizeThreadTitle("Work/Q3/Plan")).toBe("Work/Q3/Plan");
+describe("normalizeFolderPath", () => {
+  it("normalizes paths to slash-separated segments", () => {
+    expect(normalizeFolderPath("Work / Q3 ")).toBe("Work/Q3");
   });
 
-  it("collapses leading, trailing, and doubled slashes", () => {
-    expect(normalizeThreadTitle("/Work//Q3/")).toBe("Work/Q3");
-  });
-
-  it("trims whitespace around each segment", () => {
-    expect(normalizeThreadTitle("Work / Q3 ")).toBe("Work/Q3");
+  it("normalizes empty paths to null", () => {
+    expect(normalizeFolderPath("///")).toBeNull();
+    expect(normalizeFolderPath(null)).toBeNull();
   });
+});
 
-  it("leaves a single segment unchanged (after trimming)", () => {
-    expect(normalizeThreadTitle(" Standalone ")).toBe("Standalone");
+describe("parseThreadFolderShortcut", () => {
+  it("splits an explicit slash rename into folderPath and title", () => {
+    expect(parseThreadFolderShortcut("Work/Q3/Plan")).toEqual({
+      folderPath: "Work/Q3",
+      title: "Plan",
+    });
   });
 
-  it("normalizes an all-slashes or empty title to an empty string", () => {
-    expect(normalizeThreadTitle("///")).toBe("");
-    expect(normalizeThreadTitle("")).toBe("");
+  it("keeps slashy titles literal when they do not define a folder and leaf", () => {
+    expect(parseThreadFolderShortcut("Standalone")).toEqual({
+      folderPath: null,
+      title: "Standalone",
+    });
+    expect(parseThreadFolderShortcut("Work/")).toEqual({
+      folderPath: null,
+      title: "Work/",
+    });
   });
 
-  it("is idempotent on already-normalized titles", () => {
-    const normalized = normalizeThreadTitle("/Work//Q3/");
-    expect(normalizeThreadTitle(normalized)).toBe(normalized);
+  it("collapses leading, trailing, and doubled slashes in explicit paths", () => {
+    expect(parseThreadFolderShortcut("/Work//Q3/Plan/")).toEqual({
+      folderPath: "Work/Q3",
+      title: "Plan",
+    });
   });
 });
 
@@ -110,44 +100,21 @@ describe("buildFolderKey", () => {
   });
 });
 
-describe("buildThreadTitleForFolderPath", () => {
-  it("keeps the leaf and rewrites the folder prefix", () => {
-    expect(buildThreadTitleForFolderPath("Work/Q3/Plan", ["Personal"])).toBe(
-      "Personal/Plan",
-    );
-  });
-
-  it("strips the folder prefix for a top-level destination", () => {
-    expect(buildThreadTitleForFolderPath("Work/Q3/Plan", [])).toBe("Plan");
-  });
-
-  it("normalizes destination segments", () => {
-    expect(
-      buildThreadTitleForFolderPath(" Work / Q3 / Plan ", [" Personal "]),
-    ).toBe("Personal/Plan");
-  });
-});
-
 describe("folderAncestorKeys", () => {
   it("returns every ancestor folder key, outermost first", () => {
-    expect(folderAncestorKeys("proj_1", "Work/Q3/Plan")).toEqual([
+    expect(folderAncestorKeys("proj_1", "Work/Q3")).toEqual([
       "proj_1::Work",
       "proj_1::Work/Q3",
     ]);
   });
 
-  it("returns no keys for a title with no folder", () => {
-    expect(folderAncestorKeys("proj_1", "Standalone")).toEqual([]);
-    expect(folderAncestorKeys("proj_1", "Work/")).toEqual([]);
-  });
-
-  it("excludes the leaf — only the folders that contain the thread", () => {
-    // "A/B" lives in folder "A"; "B" is the thread, not a folder.
-    expect(folderAncestorKeys("pinned", "A/B")).toEqual(["pinned::A"]);
+  it("returns no keys for no folder path", () => {
+    expect(folderAncestorKeys("proj_1", null)).toEqual([]);
+    expect(folderAncestorKeys("proj_1", "")).toEqual([]);
   });
 
   it("namespaces by container, including the global sentinels", () => {
-    expect(folderAncestorKeys("pinned", "A/B/C")).toEqual([
+    expect(folderAncestorKeys("pinned", "A/B")).toEqual([
       "pinned::A",
       "pinned::A/B",
     ]);
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
index 83c6c367b..0549c9830 100644
--- a/apps/app/src/components/sidebar/folderPath.ts
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -1,66 +1,60 @@
-// Pure helpers for the sidebar's derived folder layer. A thread title carries
-// its folder path inline: "/" is read as a separator, so "Work/Q3/Plan" is a
-// thread named "Plan" inside folders "Work" › "Q3". Nothing about folders is
-// stored — these functions are the single canonical home for parsing a title
-// into its folder ancestors + leaf, normalizing a title before it is written
-// back on rename, and detecting whether a title creates a folder.
+// Pure helpers for sidebar folders. Thread titles are display text; folder
+// membership lives in `thread.folderPath`. Slash parsing is only used by
+// explicit UI affordances that choose to write folder metadata.
 
-export interface ThreadFolderPath {
-  /** Folder ancestors, outermost first. Empty when the title has no folder. */
-  folders: string[];
-  /** The thread's own name — the last path segment (or the whole title). */
-  leaf: string;
+export interface ThreadFolderShortcut {
+  /** Normalized folder path written to thread.folderPath, or null for none. */
+  folderPath: string | null;
+  /** Thread title written separately from the folder path. */
+  title: string;
 }
 
-// Split a title into its non-empty, trimmed segments. Collapses leading,
-// trailing, and doubled slashes and trims whitespace around each segment, so
-// "/Work//Q3/" and "Work / Q3 " both yield ["Work", "Q3"]. Shared by every
-// other helper here so parsing, normalizing, and detection stay consistent and
-// idempotent (re-running on already-normalized input is a no-op).
-function splitTitleSegments(title: string): string[] {
-  return title
+function splitPathSegments(value: string): string[] {
+  return value
     .split("/")
     .map((segment) => segment.trim())
     .filter((segment) => segment.length > 0);
 }
 
-// Split a stored title into folder ancestors + leaf for rendering. A single
-// segment (or an all-slashes/empty title) has no folder. The leaf is always the
-// final segment; for an empty result the leaf is "".
-export function parseThreadFolderPath(title: string): ThreadFolderPath {
-  const segments = splitTitleSegments(title);
-  if (segments.length === 0) {
-    return { folders: [], leaf: "" };
+export function splitFolderPath(
+  folderPath: string | null | undefined,
+): string[] {
+  if (!folderPath) {
+    return [];
   }
-  return {
-    folders: segments.slice(0, -1),
-    leaf: segments[segments.length - 1],
-  };
+  return splitPathSegments(folderPath);
 }
 
-// Canonical form written back on rename submit: split → trim → drop empties →
-// re-join with "/". "///" normalizes to "" (then blocked by empty-name
-// validation upstream); "Work / Q3 " normalizes to "Work/Q3".
-export function normalizeThreadTitle(title: string): string {
-  return splitTitleSegments(title).join("/");
+export function normalizeFolderPath(
+  folderPath: string | null | undefined,
+): string | null {
+  const normalized = splitFolderPath(folderPath).join("/");
+  return normalized.length > 0 ? normalized : null;
 }
 
-// True when the normalized title yields at least one folder segment, i.e. two
-// or more segments survive normalization. "Work/Q3" → true; "Work", "Work/",
-// and "///" → false.
-export function titleCreatesFolder(title: string): boolean {
-  return parseThreadFolderPath(title).folders.length > 0;
+export function parseThreadFolderShortcut(value: string): ThreadFolderShortcut {
+  const segments = splitPathSegments(value);
+  if (segments.length <= 1) {
+    return { folderPath: null, title: value.trim() };
+  }
+  return {
+    folderPath: segments.slice(0, -1).join("/"),
+    title: segments[segments.length - 1],
+  };
 }
 
-// Every ancestor folder key for a title, outermost first — e.g. "Work/Q3/Plan"
-// in container "p" → ["p::Work", "p::Work/Q3"]. Used to un-collapse the folders
-// hiding a selected thread. Derive `title` from the thread that is actually
-// bucketed (a section's top-level thread), since a nested child's "/" is ignored.
+export function titleCreatesFolder(value: string): boolean {
+  return parseThreadFolderShortcut(value).folderPath !== null;
+}
+
+// Every ancestor folder key for a stored folder path, outermost first — e.g.
+// "Work/Q3" in container "p" → ["p::Work", "p::Work/Q3"]. Used to un-collapse
+// the folders hiding a selected thread.
 export function folderAncestorKeys(
   containerId: string,
-  title: string,
+  folderPath: string | null | undefined,
 ): string[] {
-  const { folders } = parseThreadFolderPath(title);
+  const folders = splitFolderPath(folderPath);
   const keys: string[] = [];
   for (let depth = 1; depth <= folders.length; depth += 1) {
     keys.push(buildFolderKey(containerId, folders.slice(0, depth)));
@@ -68,25 +62,14 @@ export function folderAncestorKeys(
   return keys;
 }
 
-// Human-readable folder path, used for tooltips, accessible names, and the
-// rename preview ("Work › Q3 › Planning"). The visible separator differs from
-// the stored "/" so a path reads as breadcrumbs, not a literal title.
+// Human-readable folder path, used for tooltips and accessible names. The
+// visible separator differs from the stored "/" so paths read as breadcrumbs.
 export const FOLDER_PATH_SEPARATOR = " › ";
 
 export function formatFolderPathLabel(segments: readonly string[]): string {
   return segments.join(FOLDER_PATH_SEPARATOR);
 }
 
-// Re-file a thread into a destination folder path while keeping its current
-// leaf. An empty destination strips the folder prefix and returns just the leaf.
-export function buildThreadTitleForFolderPath(
-  title: string,
-  destinationFolders: readonly string[],
-): string {
-  const { leaf } = parseThreadFolderPath(title);
-  return normalizeThreadTitle([...destinationFolders, leaf].join("/"));
-}
-
 // Stable identity for a folder within a section. `containerId` is the owner of
 // the section — a `proj_*` id for project sections, or a fixed sentinel for the
 // global sections — so "Work" in project A never collides with "Work" in
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
index c28099934..135b8b05a 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
@@ -14,6 +14,7 @@ function createThread(
     providerId: "codex",
     title: "Thread",
     titleFallback: "Thread",
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
@@ -187,18 +188,20 @@ describe("buildPinnedSidebarState", () => {
   it("folds pinned roots into folders ordered by the pinned comparator", () => {
     const state = buildPinnedSidebarState({
       threads: [
-        // FolderA's pinned thread sorts after FolderB's by pinSortKey, so
-        // FolderB's folder must render first under the pinned (not sidebar)
+        // Work's pinned thread sorts after Personal's by pinSortKey, so
+        // Personal's folder must render first under the pinned (not sidebar)
         // ordering.
         createThread({
           id: "a",
-          title: "Work/Alpha",
+          title: "Alpha",
+          folderPath: "Work",
           pinnedAt: 1_000,
           pinSortKey: "b",
         }),
         createThread({
           id: "b",
-          title: "Personal/Beta",
+          title: "Beta",
+          folderPath: "Personal",
           pinnedAt: 1_000,
           pinSortKey: "a",
         }),
@@ -216,7 +219,13 @@ describe("buildPinnedSidebarState", () => {
   it("keeps a flat thread list under Group by: None", () => {
     const state = buildPinnedSidebarState({
       threads: [
-        createThread({ id: "a", title: "Work/Alpha", pinnedAt: 1_000, pinSortKey: "a" }),
+        createThread({
+          id: "a",
+          title: "Alpha",
+          folderPath: "Work",
+          pinnedAt: 1_000,
+          pinSortKey: "a",
+        }),
       ],
       groupBy: "none",
     });
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
index 0831599ae..87a241a6f 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
@@ -13,7 +13,7 @@ export interface PinnedSidebarState {
   effectivePinnedThreadIds: Set<string>;
   rootNodes: ProjectThreadNode[];
   // Folder-aware render list: flat thread items under Group by: None, folded
-  // into folders (ordered by comparePinnedRoots) under Group by: Folder.
+  // by stored folderPath (ordered by comparePinnedRoots) under Group by: Folder.
   rootItems: ProjectThreadItem[];
 }
 
@@ -134,7 +134,9 @@ export function buildPinnedSidebarState({
   );
   const projectItems = buildProjectThreadGroups(effectivePinnedThreads);
   const rootNodes = collectRootNodes(projectItems);
-  rootNodes.sort((left, right) => comparePinnedRoots(left.thread, right.thread));
+  rootNodes.sort((left, right) =>
+    comparePinnedRoots(left.thread, right.thread),
+  );
 
   // Pinned has its own root order (pinSortKey via comparePinnedRoots), never the
   // sidebar sort. Fold into folders using that same comparator so folders order
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
index 0ca411624..0bcc7de3c 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.test.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -28,6 +28,7 @@ function createThread(
     providerId: "codex",
     title: "Thread",
     titleFallback: "Thread",
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
@@ -484,8 +485,18 @@ describe("manual order (Sort by: None)", () => {
   it("lets manual folder mode interleave folders and loose threads by parent", () => {
     const items = buildProjectThreadGroups(
       [
-        createThread({ id: "a", title: "Work/A", latestAttentionAt: 30 }),
-        createThread({ id: "b", title: "Work/B", latestAttentionAt: 20 }),
+        createThread({
+          id: "a",
+          title: "A",
+          folderPath: "Work",
+          latestAttentionAt: 30,
+        }),
+        createThread({
+          id: "b",
+          title: "B",
+          folderPath: "Work",
+          latestAttentionAt: 20,
+        }),
         createThread({ id: "loose", title: "Loose", latestAttentionAt: 10 }),
       ],
       compareStandardThreads,
@@ -517,13 +528,13 @@ describe("manual order (Sort by: None)", () => {
 
 const FOLDER_OPTIONS = { groupBy: "folder", containerId: "proj_1" } as const;
 
-describe("folder bucketing (Group by: Folder)", () => {
-  it("nests threads into folders derived from their titles, folders above loose threads", () => {
+describe("folder bucketing", () => {
+  it("nests threads into folders derived from folderPath, folders above loose threads", () => {
     const items = buildProjectThreadGroups(
       [
-        createThread({ id: "a", title: "Work/Q3/Plan" }),
-        createThread({ id: "b", title: "Work/Q3/Notes" }),
-        createThread({ id: "c", title: "Work/Q4" }),
+        createThread({ id: "a", title: "Plan", folderPath: "Work/Q3" }),
+        createThread({ id: "b", title: "Notes", folderPath: "Work/Q3" }),
+        createThread({ id: "c", title: "Q4", folderPath: "Work" }),
         createThread({ id: "d", title: "Standalone" }),
       ],
       compareStandardThreads,
@@ -541,14 +552,28 @@ describe("folder bucketing (Group by: Folder)", () => {
     ]);
   });
 
+  it("does not derive folders from slashes in titles", () => {
+    const items = buildProjectThreadGroups(
+      [
+        createThread({ id: "a", title: "Work/Q3/Plan" }),
+        createThread({ id: "b", title: "Work/Notes" }),
+      ],
+      compareStandardThreads,
+      FOLDER_OPTIONS,
+    );
+
+    expect(summarizeItems(items)).toEqual(["a", "b"]);
+  });
+
   it("keeps a folder thread's own children nested under it and ignores their slashes", () => {
     const items = buildProjectThreadGroups(
       [
-        createThread({ id: "parent", title: "Work/Project" }),
+        createThread({ id: "parent", title: "Project", folderPath: "Work" }),
         createThread({
           id: "child",
           parentThreadId: "parent",
-          title: "Ignored/Child/Path",
+          title: "Path",
+          folderPath: "Ignored/Child",
         }),
       ],
       compareStandardThreads,
@@ -556,7 +581,7 @@ describe("folder bucketing (Group by: Folder)", () => {
     );
 
     // Only the top-level "parent" forms a folder; the child stays nested under
-    // it and its own "/" does not create a folder.
+    // it and its own folderPath does not create a second folder branch.
     expect(summarizeItems(items)).toEqual([
       {
         folder: "proj_1::Work",
@@ -570,13 +595,15 @@ describe("folder bucketing (Group by: Folder)", () => {
       [
         createThread({
           id: "w1",
-          title: "Work/Alpha",
+          title: "Alpha",
+          folderPath: "Work",
           environmentId: "env_shared",
           environmentWorkspaceDisplayKind: "managed-worktree",
         }),
         createThread({
           id: "w2",
-          title: "Work/Beta",
+          title: "Beta",
+          folderPath: "Work",
           environmentId: "env_shared",
           environmentWorkspaceDisplayKind: "managed-worktree",
         }),
@@ -597,7 +624,8 @@ describe("folder bucketing (Group by: Folder)", () => {
     const threads = [
       createThread({
         id: "old-active",
-        title: "FolderA/x",
+        title: "x",
+        folderPath: "FolderA",
         status: "active",
         createdAt: 10,
         latestAttentionAt: 5,
@@ -605,7 +633,8 @@ describe("folder bucketing (Group by: Folder)", () => {
       }),
       createThread({
         id: "new-idle",
-        title: "FolderB/y",
+        title: "y",
+        folderPath: "FolderB",
         status: "idle",
         createdAt: 50,
         latestAttentionAt: 5,
@@ -646,10 +675,11 @@ describe("folder bucketing (Group by: Folder)", () => {
       buildProjectThreadGroups([
         createThread({
           id: "busy",
-          title: "Work/Busy",
+          title: "Busy",
+          folderPath: "Work",
           hasPendingInteraction: true,
         }),
-        createThread({ id: "quiet", title: "Work/Quiet" }),
+        createThread({ id: "quiet", title: "Quiet", folderPath: "Work" }),
       ]),
       "proj_1",
       compareStandardThreads,
@@ -667,8 +697,18 @@ describe("folder bucketing (Group by: Folder)", () => {
   it("folds the chronological list into folders too", () => {
     const items = buildChronologicalThreadList(
       [
-        createThread({ id: "a", title: "Work/One", createdAt: 20 }),
-        createThread({ id: "b", title: "Personal/Two", createdAt: 10 }),
+        createThread({
+          id: "a",
+          title: "One",
+          folderPath: "Work",
+          createdAt: 20,
+        }),
+        createThread({
+          id: "b",
+          title: "Two",
+          folderPath: "Personal",
+          createdAt: 10,
+        }),
       ],
       compareByCreatedAtDescending,
       { groupBy: "folder", containerId: "chronological" },
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.ts b/apps/app/src/components/sidebar/projectThreadGroups.ts
index 6f3af0ad5..79fa7db70 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.ts
@@ -7,7 +7,7 @@ import {
   getCollapsedChildActivity,
   type CollapsedChildActivity,
 } from "@/lib/thread-activity";
-import { buildFolderKey, parseThreadFolderPath } from "./folderPath";
+import { buildFolderKey, splitFolderPath } from "./folderPath";
 import type {
   SidebarGroupBy,
   SidebarManualOrder,
@@ -37,8 +37,7 @@ export interface EnvironmentThreadGroup {
   stats: ProjectThreadNodeStats;
 }
 
-// A derived folder node (Group by: Folder). Folders are a pure rendering layer
-// folded out of "/"-separated thread titles by bucketIntoFolders — never stored.
+// A folder node folded out of stored thread.folderPath metadata.
 // A folder holds further items (threads, env groups, and nested folders) and
 // rolls up its descendants' count + activity so a collapsed header can speak for
 // them, mirroring a collapsed parent thread.
@@ -60,10 +59,10 @@ export type ProjectThreadItem =
   | { kind: "environment"; group: EnvironmentThreadGroup }
   | { kind: "folder"; group: SidebarFolderGroup };
 
-// Opt-in folder grouping, threaded into the three assembly sites. `containerId`
-// scopes folder identity to its section (a `proj_*` id, or the sentinels
-// below). When groupBy is "none" each site early-returns its current output
-// untouched — no folder logic runs.
+// Folder grouping, threaded into the three assembly sites. `containerId` scopes
+// folder identity to its section (a `proj_*` id, or the sentinels below). When
+// groupBy is "none" each site early-returns its current output untouched — no
+// folder logic runs.
 export interface SidebarFolderOptions {
   groupBy: SidebarGroupBy;
   containerId: string;
@@ -355,8 +354,8 @@ export function buildProjectThreadGroups(
   }
 
   const rootItems = buildSortedItems(rootNodes, compareThreads);
-  // Group by: None — return today's output untouched unless Sort: None has
-  // explicitly supplied a manual order for this section.
+  // Group by: None — return today's output untouched unless an internal test
+  // path explicitly supplied a manual order for this section.
   if (folderOptions?.groupBy !== "folder") {
     if (folderOptions?.manualOrder) {
       return orderSiblingItems(
@@ -481,16 +480,14 @@ function hasAtLeastTwoThreadNodes(
 }
 
 // ---------------------------------------------------------------------------
-// Folder bucketing (Group by: Folder)
+// Folder bucketing
 //
-// A pure, opt-in layer that folds an already-built top-level item list into a
-// nested folder tree derived from each top-level thread's "/"-separated title.
-// Only top-level items form folders; a thread's own children and env groups
-// keep nesting under its leaf exactly as today (a child's "/" is ignored). The
-// active comparator still drives order — folders render as a block above loose
-// items, and folders, their contents, and the loose block are each sorted
-// recursively by the same comparator (folders by their representative
-// descendant — the descendant that sorts first).
+// A pure layer that folds an already-built top-level item list into a nested
+// folder tree derived from each top-level thread's stored folderPath. Only
+// top-level items form folders; a thread's own children and env groups keep
+// nesting under it exactly as today. The active comparator still drives order:
+// folders render as a block above loose items, and folders, their contents, and
+// the loose block are each sorted recursively by the same comparator.
 // ---------------------------------------------------------------------------
 
 interface FolderBucket {
@@ -506,8 +503,8 @@ function createFolderBucket(): FolderBucket {
   return { subfolders: new Map(), items: [] };
 }
 
-// The thread that orders an item among its siblings, and whose title decides
-// its folder path: a thread/env item keeps today's representative; a folder
+// The thread that orders an item among its siblings, and whose folderPath
+// decides its folder path: a thread/env item keeps today's representative; a folder
 // uses the descendant thread that sorts first under the active comparator.
 function getItemOrderingThread(
   item: ProjectThreadItem,
@@ -589,10 +586,9 @@ function orderItemsByManualOrder(
   return [...unorderedItems, ...orderedItems];
 }
 
-// The one sibling-ordering hook. Today it orders folders-first, each block by
-// the active comparator. Under Sort: None it instead applies the stored
-// per-parent manual order; missing child keys stay at the top in fallback order
-// until the first drag writes a complete order for that parent.
+// The one sibling-ordering hook. It orders folders-first, each block by the
+// active comparator. Internal manual-order tests can still supply a stored
+// per-parent order; missing child keys stay at the top in fallback order.
 function orderSiblingItems(
   items: readonly ProjectThreadItem[],
   parentKey: string,
@@ -674,9 +670,9 @@ function buildFolderLevelItems(
 }
 
 // Fold a top-level item list into a nested folder tree. Items whose
-// representative thread's title has no folder segment stay loose at the top
-// level; the rest nest into the deepest folder of their path. No empty folders:
-// a folder node exists only because >=1 item resolved into it.
+// representative thread has no folderPath stay loose at the top level; the rest
+// nest into the deepest folder of their path. No empty folders: a folder node
+// exists only because >=1 item resolved into it.
 export function bucketIntoFolders(
   items: readonly ProjectThreadItem[],
   containerId: string,
@@ -686,7 +682,7 @@ export function bucketIntoFolders(
   const root = createFolderBucket();
   for (const item of items) {
     const orderingThread = getItemOrderingThread(item, compareThreads);
-    const { folders } = parseThreadFolderPath(orderingThread.title ?? "");
+    const folders = splitFolderPath(orderingThread.folderPath);
     let bucket = root;
     for (const segment of folders) {
       let next = bucket.subfolders.get(segment);
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 8da02e3fe..a80987310 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -10,8 +10,6 @@ const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
-const FOLDER_GROUPING_AUTO_ENABLED_STORAGE_KEY =
-  "bb.sidebar.folderGroupingAutoEnabled";
 const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 
 export type SidebarSectionId = "pinned" | "projects" | "threads";
@@ -22,11 +20,12 @@ export type CollapsibleSidebarSectionId = "projects" | "threads";
 export type SidebarOrganizationMode = "project" | "chronological";
 // Controls thread ordering in both grouped and ungrouped sidebar views.
 // "updated" reuses the status-aware activity heuristic; "created" sorts by
-// the literal createdAt field; "none" applies the user's local manual order.
+// the literal createdAt field. "none" is a legacy/internal value that the
+// runtime normalizes back to "updated".
 export type SidebarChronologicalSort = "updated" | "created" | "none";
-// Whether "/" in a thread title renders as nested folders. Orthogonal to the
-// organization mode and sort: "none" keeps today's flat behavior (literal
-// titles), "folder" buckets top-level threads into derived folders.
+// Low-level folder grouping switch used by folder helpers and tests. The app
+// runtime always renders stored folderPath metadata; "none" remains for
+// regression coverage.
 export type SidebarGroupBy = "none" | "folder";
 // Per-parent manual order for Sort: None. Keys are section/folder parent keys;
 // values are child thread ids and child folder keys.
@@ -91,7 +90,8 @@ export const sidebarChronologicalSortAtom =
     { getOnInit: true },
   );
 
-// Opt-in folder grouping. Default "none" keeps the current sidebar layout.
+// Story/test control for the low-level folder grouping path. Runtime sidebar
+// trees pass "folder" directly so stored folderPath metadata always renders.
 export const sidebarGroupByAtom = atomWithStorage<SidebarGroupBy>(
   GROUP_BY_STORAGE_KEY,
   "none",
@@ -108,15 +108,6 @@ export const sidebarCollapsedFoldersAtom = atomWithStorage<string[]>(
   { getOnInit: true },
 );
 
-// Whether slash-titled threads have already auto-enabled folder grouping. Once
-// true, a later explicit Group by: None choice should stick across refreshes.
-export const sidebarFolderGroupingAutoEnabledAtom = atomWithStorage<boolean>(
-  FOLDER_GROUPING_AUTO_ENABLED_STORAGE_KEY,
-  false,
-  createJsonLocalStorage<boolean>(),
-  { getOnInit: true },
-);
-
 export const sidebarManualOrderAtom = atomWithStorage<SidebarManualOrder>(
   MANUAL_ORDER_STORAGE_KEY,
   {},
diff --git a/apps/app/src/components/thread/ThreadActionsProvider.tsx b/apps/app/src/components/thread/ThreadActionsProvider.tsx
index bcccb7f76..6b31bc3d6 100644
--- a/apps/app/src/components/thread/ThreadActionsProvider.tsx
+++ b/apps/app/src/components/thread/ThreadActionsProvider.tsx
@@ -7,7 +7,6 @@ import {
   useRef,
   type ReactNode,
 } from "react";
-import { useAtom } from "jotai";
 import { useNavigate } from "react-router-dom";
 import { appToast } from "@/components/ui/app-toast";
 import { defaultExperiments, type Thread } from "@bb/domain";
@@ -31,6 +30,7 @@ import {
 import { getThreadDisplayTitle } from "@/lib/thread-title";
 import {
   ThreadRenameDialog,
+  type ThreadRenameDialogPayload,
   type ThreadRenameDialogTarget,
 } from "@/components/dialogs/ThreadRenameDialog";
 import {
@@ -39,12 +39,6 @@ import {
 } from "@/components/dialogs/ThreadDeleteDialog";
 import { ArchivedThreadToastTitle } from "@/components/thread/ArchivedThreadToastTitle";
 import { destroyPersistedBrowserViewsForThread } from "@/components/secondary-panel/browserViewVisibilityCoordinator";
-import { titleCreatesFolder } from "@/components/sidebar/folderPath";
-import {
-  sidebarFolderGroupingAutoEnabledAtom,
-  sidebarGroupByAtom,
-  sidebarOrganizationModeAtom,
-} from "@/components/sidebar/sidebarCollapsedAtoms";
 import { getThreadReadToggleAction } from "@/components/sidebar/threadReadState";
 import { getRootComposeRoutePath, getThreadRoutePath } from "@/lib/route-paths";
 import { getDesktopBrowserApi, getDesktopPopoutApi } from "@/lib/bb-desktop";
@@ -104,11 +98,6 @@ export function ThreadActionsProvider({
   const deleteThread = useDeleteThread();
   const updateThread = useUpdateThread();
   const systemConfigQuery = useSystemConfig();
-  const [groupBy, setGroupBy] = useAtom(sidebarGroupByAtom);
-  const [, setOrganizationMode] = useAtom(sidebarOrganizationModeAtom);
-  const [, setFolderGroupingAutoEnabled] = useAtom(
-    sidebarFolderGroupingAutoEnabledAtom,
-  );
   const threadActionContextAbortRef = useRef<AbortController | null>(null);
   // Destructure `.mutate` so useCallback deps see stable references across
   // renders. Depending on the full mutation objects would churn callback
@@ -160,31 +149,17 @@ export function ThreadActionsProvider({
   );
 
   const submitRename = useCallback(
-    (threadId: string, title: string) => {
+    (threadId: string, payload: ThreadRenameDialogPayload) => {
       updateMutate(
-        { id: threadId, title },
+        { id: threadId, ...payload },
         {
           onSuccess: () => {
-            if (titleCreatesFolder(title)) {
-              setFolderGroupingAutoEnabled(true);
-              setOrganizationMode("chronological");
-              if (groupBy === "none") {
-                setGroupBy("folder");
-              }
-            }
             closeRenameDialog();
           },
         },
       );
     },
-    [
-      closeRenameDialog,
-      groupBy,
-      setFolderGroupingAutoEnabled,
-      setGroupBy,
-      setOrganizationMode,
-      updateMutate,
-    ],
+    [closeRenameDialog, updateMutate],
   );
 
   // Fetches the delete dialog context. Returns null when the caller's request
diff --git a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
index 2d995a36d..1fdc6401d 100644
--- a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
+++ b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
@@ -23,6 +23,7 @@ function makeThreadWithRuntime(
     providerId: "codex",
     title: null,
     titleFallback: null,
+    folderPath: null,
     status: "active",
     parentThreadId: null,
     sourceThreadId: null,
diff --git a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.ts b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.ts
index cc11c23d5..a62303756 100644
--- a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.ts
+++ b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.ts
@@ -62,9 +62,15 @@ interface BeginThreadReadStateTransactionArgs extends ThreadIdCacheArgs {
 }
 
 interface BeginThreadTitleTransactionArgs extends ThreadIdCacheArgs {
+  folderPath?: string | null;
   title: string | null;
 }
 
+interface BeginThreadMetadataTransactionArgs extends ThreadIdCacheArgs {
+  folderPath?: string | null;
+  title?: string | null;
+}
+
 interface ReorderPinnedThreadTransactionRequest extends ReorderPinnedThreadRequest {
   id: string;
 }
@@ -361,18 +367,37 @@ export function beginThreadReadStateTransaction({
 }
 
 export function beginThreadTitleTransaction({
+  folderPath,
   queryClient,
   threadId,
   title,
 }: BeginThreadTitleTransactionArgs): Promise<ThreadListMutationTransaction> {
+  return beginThreadMetadataTransaction({
+    folderPath,
+    queryClient,
+    threadId,
+    title,
+  });
+}
+
+export function beginThreadMetadataTransaction({
+  folderPath,
+  queryClient,
+  threadId,
+  title,
+}: BeginThreadMetadataTransactionArgs): Promise<ThreadListMutationTransaction> {
+  const patch = {
+    ...(title !== undefined ? { title } : {}),
+    ...(folderPath !== undefined ? { folderPath } : {}),
+  };
   return runOptimisticThreadFieldTransaction({
     applyToLists: (queryClient, threadId) =>
       applyToCachedThreadListsAndSidebarNavigation(queryClient, (list) =>
         list.map((thread) =>
-          thread.id === threadId ? { ...thread, title } : thread,
+          thread.id === threadId ? { ...thread, ...patch } : thread,
         ),
       ),
-    patch: { title },
+    patch,
     queryClient,
     threadId,
   });
diff --git a/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx b/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
index bd9017127..a46ce0a18 100644
--- a/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
+++ b/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
@@ -34,6 +34,7 @@ function makeThreadWithRuntime(
     providerId: "codex",
     title: null,
     titleFallback: null,
+    folderPath: null,
     status: "active",
     parentThreadId: null,
     sourceThreadId: null,
@@ -182,4 +183,74 @@ describe("thread state mutations", () => {
       expect(result.current.isSuccess).toBe(true);
     });
   });
+
+  it("optimistically moves a thread between folders while the update request is pending", async () => {
+    const { queryClient, wrapper } = createQueryClientTestHarness();
+    const threadId = "thread-1";
+    const thread = makeThreadWithRuntime({
+      id: threadId,
+      folderPath: "Work",
+    });
+    const listEntry = makeThreadListEntry({
+      id: threadId,
+      folderPath: "Work",
+    });
+    const threadListKey = threadListQueryKey({
+      archived: false,
+      projectId: "project-1",
+    });
+    let resolveUpdate: (thread: ThreadResponse) => void = () => {};
+
+    queryClient.setQueryData(threadQueryKey(threadId), thread);
+    queryClient.setQueryData(threadListKey, [listEntry]);
+    queryClient.setQueryData(
+      sidebarNavigationQueryKey(),
+      makeSidebarNavigation([listEntry]),
+    );
+    vi.mocked(api.updateThread).mockImplementation(
+      () =>
+        new Promise<ThreadResponse>((resolve) => {
+          resolveUpdate = resolve;
+        }),
+    );
+
+    const { result } = renderHook(() => useUpdateThread(), { wrapper });
+
+    act(() => {
+      result.current.mutate({ id: threadId, folderPath: "Personal" });
+    });
+
+    await waitFor(() => {
+      expect(
+        queryClient.getQueryData<ThreadWithRuntime>(threadQueryKey(threadId))
+          ?.folderPath,
+      ).toBe("Personal");
+    });
+    expect(
+      queryClient.getQueryData<ThreadListEntry[]>(threadListKey)?.[0]
+        ?.folderPath,
+    ).toBe("Personal");
+    expect(
+      queryClient.getQueryData<SidebarBootstrapResponse>(
+        sidebarNavigationQueryKey(),
+      )?.projects[0]?.threads[0]?.folderPath,
+    ).toBe("Personal");
+    expect(api.updateThread).toHaveBeenCalledWith(threadId, {
+      folderPath: "Personal",
+    });
+
+    act(() => {
+      resolveUpdate(
+        makeThreadResponse({
+          id: threadId,
+          folderPath: "Personal",
+          updatedAt: 2,
+        }),
+      );
+    });
+
+    await waitFor(() => {
+      expect(result.current.isSuccess).toBe(true);
+    });
+  });
 });
diff --git a/apps/app/src/hooks/mutations/thread-state-mutations.ts b/apps/app/src/hooks/mutations/thread-state-mutations.ts
index 37c0990c3..caef8340b 100644
--- a/apps/app/src/hooks/mutations/thread-state-mutations.ts
+++ b/apps/app/src/hooks/mutations/thread-state-mutations.ts
@@ -17,7 +17,7 @@ import {
   beginDeleteThreadTransaction,
   beginPinThreadTransaction,
   beginThreadReadStateTransaction,
-  beginThreadTitleTransaction,
+  beginThreadMetadataTransaction,
   beginReorderPinnedThreadTransaction,
   beginUnarchiveThreadTransaction,
   beginUnpinThreadTransaction,
@@ -78,14 +78,16 @@ export function useUpdateThread(options?: UpdateThreadMutationOptions) {
     mutationFn: ({ id, ...request }: UpdateThreadMutationRequest) =>
       api.updateThread(id, request),
     onMutate: ({
+      folderPath,
       id,
       title,
     }): Promise<ThreadListMutationTransaction | undefined> | undefined => {
-      if (title === undefined) {
+      if (title === undefined && folderPath === undefined) {
         return undefined;
       }
 
-      return beginThreadTitleTransaction({
+      return beginThreadMetadataTransaction({
+        folderPath,
         queryClient,
         threadId: id,
         title,
diff --git a/apps/app/src/hooks/queries/query-helpers.test.ts b/apps/app/src/hooks/queries/query-helpers.test.ts
index 5f3f81e30..9f0159a7c 100644
--- a/apps/app/src/hooks/queries/query-helpers.test.ts
+++ b/apps/app/src/hooks/queries/query-helpers.test.ts
@@ -130,6 +130,7 @@ function makeThreadWithRuntime(
     environmentId: "env-1",
     title: null,
     titleFallback: null,
+    folderPath: null,
     parentThreadId: null,
     sourceThreadId: null,
     originKind: null,
diff --git a/apps/app/src/hooks/threadMentionSuggestions.test.ts b/apps/app/src/hooks/threadMentionSuggestions.test.ts
index 52755c535..7393ad371 100644
--- a/apps/app/src/hooks/threadMentionSuggestions.test.ts
+++ b/apps/app/src/hooks/threadMentionSuggestions.test.ts
@@ -26,6 +26,7 @@ function makeThread(options: ThreadFixtureOptions): Thread {
     providerId: "openai",
     title: options.title,
     titleFallback: options.titleFallback ?? null,
+    folderPath: null,
     status: "idle",
     parentThreadId: options.parentThreadId ?? null,
     sourceThreadId: null,
diff --git a/apps/app/src/hooks/useForkThreadFromMessage.test.tsx b/apps/app/src/hooks/useForkThreadFromMessage.test.tsx
index dcbe315d1..125396b57 100644
--- a/apps/app/src/hooks/useForkThreadFromMessage.test.tsx
+++ b/apps/app/src/hooks/useForkThreadFromMessage.test.tsx
@@ -57,6 +57,7 @@ function makeThread(overrides: Partial<Thread> = {}): Thread {
     status: "idle",
     title: null,
     titleFallback: "Fallback fork title",
+    folderPath: null,
     updatedAt: 1,
   };
   return { ...base, ...overrides };
@@ -97,9 +98,9 @@ describe("useForkThreadFromMessage", () => {
     const navigateState = mocks.navigate.mock.calls[0]?.[1]?.state as
       | Record<string, unknown>
       | undefined;
-    const seed = navigateState?.[
-      FORK_THREAD_CREATE_SEED_LOCATION_STATE_KEY
-    ] as ForkThreadCreateSeed | undefined;
+    const seed = navigateState?.[FORK_THREAD_CREATE_SEED_LOCATION_STATE_KEY] as
+      | ForkThreadCreateSeed
+      | undefined;
     expect(seed).toMatchObject({
       environmentId: "env_source",
       model: "gpt-5",
diff --git a/apps/app/src/lib/fork-thread-request.test.ts b/apps/app/src/lib/fork-thread-request.test.ts
index 8e8338dbe..8b540e5d4 100644
--- a/apps/app/src/lib/fork-thread-request.test.ts
+++ b/apps/app/src/lib/fork-thread-request.test.ts
@@ -24,6 +24,7 @@ function makeThread(overrides: Partial<Thread> = {}): Thread {
     status: "idle",
     title: "Investigate flaky test",
     titleFallback: null,
+    folderPath: null,
     updatedAt: 1,
   };
   return { ...base, ...overrides };
diff --git a/apps/app/src/views/RootComposeMobileRecents.test.tsx b/apps/app/src/views/RootComposeMobileRecents.test.tsx
index 1f7835146..2b91dcae2 100644
--- a/apps/app/src/views/RootComposeMobileRecents.test.tsx
+++ b/apps/app/src/views/RootComposeMobileRecents.test.tsx
@@ -18,6 +18,7 @@ function makeThread(args: MakeThreadArgs): ThreadListEntry {
     providerId: "codex",
     title: args.title,
     titleFallback: args.title,
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
diff --git a/apps/app/src/views/RootComposeView.test.ts b/apps/app/src/views/RootComposeView.test.ts
index ba0e48e00..e9ecf4ed5 100644
--- a/apps/app/src/views/RootComposeView.test.ts
+++ b/apps/app/src/views/RootComposeView.test.ts
@@ -57,6 +57,7 @@ function makeThread(args: MakeThreadArgs): ThreadListEntry {
     providerId: "codex",
     title: args.id,
     titleFallback: args.id,
+    folderPath: null,
     status: "idle",
     parentThreadId: null,
     sourceThreadId: null,
diff --git a/apps/app/src/views/thread-detail/ThreadDetailSecondaryContent.test.tsx b/apps/app/src/views/thread-detail/ThreadDetailSecondaryContent.test.tsx
index 40fc5265e..0c6b29c69 100644
--- a/apps/app/src/views/thread-detail/ThreadDetailSecondaryContent.test.tsx
+++ b/apps/app/src/views/thread-detail/ThreadDetailSecondaryContent.test.tsx
@@ -244,6 +244,7 @@ function makeThread(
     stopRequestedAt: null,
     title: null,
     titleFallback: "Test thread",
+    folderPath: null,
     updatedAt: 0,
   } as ThreadDetailSecondaryContentProps["metadata"]["thread"];
 }
diff --git a/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts b/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts
index 0b1f2d6c7..c7be3570d 100644
--- a/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts
+++ b/apps/app/src/views/thread-detail/threadParentSelectorOptions.test.ts
@@ -36,6 +36,7 @@ function makeThread(overrides: ThreadListEntryOverrides = {}): ThreadListEntry {
     status: "idle",
     title: "Thread",
     titleFallback: "Thread",
+    folderPath: null,
     updatedAt: 1,
     ...overrides,
   };
diff --git a/apps/server/src/routes/threads/base.ts b/apps/server/src/routes/threads/base.ts
index eb5a4b1f0..26c489a3c 100644
--- a/apps/server/src/routes/threads/base.ts
+++ b/apps/server/src/routes/threads/base.ts
@@ -79,6 +79,18 @@ interface BuildThreadSearchResponseArgs {
   archived: DbThreadSearchResultGroup;
 }
 
+function normalizeThreadFolderPath(folderPath: string | null): string | null {
+  if (folderPath === null) {
+    return null;
+  }
+  const normalized = folderPath
+    .split("/")
+    .map((segment) => segment.trim())
+    .filter((segment) => segment.length > 0)
+    .join("/");
+  return normalized.length > 0 ? normalized : null;
+}
+
 function resolveIncludedThreadEnvironment(
   deps: Pick<AppDeps, "db">,
   thread: Thread,
@@ -295,6 +307,11 @@ export function registerThreadBaseRoutes(app: Hono, deps: AppDeps): void {
     if ("title" in payload) {
       metadataUpdate.title = payload.title;
     }
+    if ("folderPath" in payload) {
+      metadataUpdate.folderPath = normalizeThreadFolderPath(
+        payload.folderPath ?? null,
+      );
+    }
     if ("parentThreadId" in payload) {
       metadataUpdate.parentThreadId = payload.parentThreadId;
     }
diff --git a/apps/server/src/services/threads/thread-runtime-display.ts b/apps/server/src/services/threads/thread-runtime-display.ts
index 035c8f3d5..3f474e885 100644
--- a/apps/server/src/services/threads/thread-runtime-display.ts
+++ b/apps/server/src/services/threads/thread-runtime-display.ts
@@ -91,6 +91,7 @@ function toPublicThread(thread: Thread): Thread {
     providerId: thread.providerId,
     title: thread.title,
     titleFallback: thread.titleFallback,
+    folderPath: thread.folderPath,
     status: thread.status,
     parentThreadId: thread.parentThreadId,
     sourceThreadId: thread.sourceThreadId,
diff --git a/packages/db/drizzle/0042_thread_folder_path.sql b/packages/db/drizzle/0042_thread_folder_path.sql
new file mode 100644
index 000000000..10bdafb24
--- /dev/null
+++ b/packages/db/drizzle/0042_thread_folder_path.sql
@@ -0,0 +1 @@
+ALTER TABLE `threads` ADD `folder_path` text;
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/0042_snapshot.json b/packages/db/drizzle/meta/0042_snapshot.json
new file mode 100644
index 000000000..b1030286f
--- /dev/null
+++ b/packages/db/drizzle/meta/0042_snapshot.json
@@ -0,0 +1,2732 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "9e7dc789-70c5-49c0-9b06-270a021de7c6",
+  "prevId": "2932d6d3-e6e4-41b4-ac3f-2091e2cc7bed",
+  "tables": {
+    "apikey": {
+      "name": "apikey",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "start": {
+          "name": "start",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prefix": {
+          "name": "prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "referenceId": {
+          "name": "referenceId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refillInterval": {
+          "name": "refillInterval",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "refillAmount": {
+          "name": "refillAmount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRefillAt": {
+          "name": "lastRefillAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitEnabled": {
+          "name": "rateLimitEnabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitTimeWindow": {
+          "name": "rateLimitTimeWindow",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitMax": {
+          "name": "rateLimitMax",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "requestCount": {
+          "name": "requestCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remaining": {
+          "name": "remaining",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRequest": {
+          "name": "lastRequest",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiresAt": {
+          "name": "expiresAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configId": {
+          "name": "configId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "apikey_key_unique": {
+          "name": "apikey_key_unique",
+          "columns": [
+            "key"
+          ],
+          "isUnique": true
+        },
+        "apikey_reference_id_idx": {
+          "name": "apikey_reference_id_idx",
+          "columns": [
+            "referenceId"
+          ],
+          "isUnique": false
+        },
+        "apikey_config_id_idx": {
+          "name": "apikey_config_id_idx",
+          "columns": [
+            "configId"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "apikey_referenceId_user_id_fk": {
+          "name": "apikey_referenceId_user_id_fk",
+          "tableFrom": "apikey",
+          "tableTo": "user",
+          "columnsFrom": [
+            "referenceId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automation_runs": {
+      "name": "automation_runs",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "automation_id": {
+          "name": "automation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "skip_reason": {
+          "name": "skip_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "output": {
+          "name": "output",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scheduled_for": {
+          "name": "scheduled_for",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automation_runs_automation_started_idx": {
+          "name": "automation_runs_automation_started_idx",
+          "columns": [
+            "automation_id",
+            "started_at"
+          ],
+          "isUnique": false
+        },
+        "automation_runs_thread_idx": {
+          "name": "automation_runs_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automation_runs_automation_id_automations_id_fk": {
+          "name": "automation_runs_automation_id_automations_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "automations",
+          "columnsFrom": [
+            "automation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automation_runs_thread_id_threads_id_fk": {
+          "name": "automation_runs_thread_id_threads_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automations": {
+      "name": "automations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "target_thread_id": {
+          "name": "target_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger_config": {
+          "name": "trigger_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "execution": {
+          "name": "execution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auto_archive": {
+          "name": "auto_archive",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_by_thread_id": {
+          "name": "created_by_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_run_status": {
+          "name": "last_run_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_thread_id": {
+          "name": "last_run_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automations_project_idx": {
+          "name": "automations_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "automations_due_idx": {
+          "name": "automations_due_idx",
+          "columns": [
+            "enabled",
+            "trigger_type",
+            "next_run_at"
+          ],
+          "isUnique": false
+        },
+        "automations_target_thread_idx": {
+          "name": "automations_target_thread_idx",
+          "columns": [
+            "target_thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automations_project_id_projects_id_fk": {
+          "name": "automations_project_id_projects_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automations_target_thread_id_threads_id_fk": {
+          "name": "automations_target_thread_id_threads_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "target_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "environments": {
+      "name": "environments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "managed": {
+          "name": "managed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_git_repo": {
+          "name": "is_git_repo",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_worktree": {
+          "name": "is_worktree",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_base_branch": {
+          "name": "merge_base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "destroy_attempt_id": {
+          "name": "destroy_attempt_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_provision_type": {
+          "name": "workspace_provision_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'provisioning'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "environments_host_path_idx": {
+          "name": "environments_host_path_idx",
+          "columns": [
+            "host_id",
+            "path"
+          ],
+          "isUnique": true
+        },
+        "environments_project_idx": {
+          "name": "environments_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "environments_status_idx": {
+          "name": "environments_status_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "environments_project_id_projects_id_fk": {
+          "name": "environments_project_id_projects_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environments_host_id_hosts_id_fk": {
+          "name": "environments_host_id_hosts_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "events": {
+      "name": "events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scope_kind": {
+          "name": "scope_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sequence": {
+          "name": "sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_id": {
+          "name": "item_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "data": {
+          "name": "data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "events_thread_sequence_idx": {
+          "name": "events_thread_sequence_idx",
+          "columns": [
+            "thread_id",
+            "sequence"
+          ],
+          "isUnique": true
+        },
+        "events_thread_type_item_kind_sequence_idx": {
+          "name": "events_thread_type_item_kind_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "item_kind",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_type_sequence_idx": {
+          "name": "events_thread_type_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_turn_type_item_sequence_idx": {
+          "name": "events_thread_turn_type_item_sequence_idx",
+          "columns": [
+            "thread_id",
+            "turn_id",
+            "type",
+            "item_id",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_environment_idx": {
+          "name": "events_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "events_completed_item_truncation_idx": {
+          "name": "events_completed_item_truncation_idx",
+          "columns": [
+            "item_kind",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"events\".\"type\" = 'item/completed'"
+        }
+      },
+      "foreignKeys": {
+        "events_thread_id_threads_id_fk": {
+          "name": "events_thread_id_threads_id_fk",
+          "tableFrom": "events",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "events_environment_id_environments_id_fk": {
+          "name": "events_environment_id_environments_id_fk",
+          "tableFrom": "events",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "events_scope_shape_check": {
+          "name": "events_scope_shape_check",
+          "value": "(\n        (\"events\".\"scope_kind\" = 'turn' AND \"events\".\"turn_id\" IS NOT NULL)\n        OR\n        (\"events\".\"scope_kind\" = 'thread' AND \"events\".\"turn_id\" IS NULL)\n      )"
+        }
+      }
+    },
+    "host_daemon_sessions": {
+      "name": "host_daemon_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "instance_id": {
+          "name": "instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_name": {
+          "name": "host_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_type": {
+          "name": "host_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "data_dir": {
+          "name": "data_dir",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "protocol_version": {
+          "name": "protocol_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "heartbeat_interval_ms": {
+          "name": "heartbeat_interval_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_timeout_ms": {
+          "name": "lease_timeout_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "host_daemon_sessions_host_status_idx": {
+          "name": "host_daemon_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_host_latest_idx": {
+          "name": "host_daemon_sessions_host_latest_idx",
+          "columns": [
+            "host_id",
+            "updated_at",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_closed_prune_idx": {
+          "name": "host_daemon_sessions_closed_prune_idx",
+          "columns": [
+            "status",
+            "closed_at",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "host_daemon_sessions_host_id_hosts_id_fk": {
+          "name": "host_daemon_sessions_host_id_hosts_id_fk",
+          "tableFrom": "host_daemon_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "hosts": {
+      "name": "hosts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "destroyed_at": {
+          "name": "destroyed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "hosts_last_seen_idx": {
+          "name": "hosts_last_seen_idx",
+          "columns": [
+            "last_seen_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "maintenance_scan_cursors": {
+      "name": "maintenance_scan_cursors",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "policy": {
+          "name": "policy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "output_path": {
+          "name": "output_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_created_at": {
+          "name": "last_created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_event_id": {
+          "name": "last_event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "maintenance_scan_cursors_path_idx": {
+          "name": "maintenance_scan_cursors_path_idx",
+          "columns": [
+            "policy",
+            "version",
+            "item_kind",
+            "output_path"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "pending_interactions": {
+      "name": "pending_interactions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_request_id": {
+          "name": "provider_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolution": {
+          "name": "resolution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_reason": {
+          "name": "status_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolved_at": {
+          "name": "resolved_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "pending_interactions_provider_request_idx": {
+          "name": "pending_interactions_provider_request_idx",
+          "columns": [
+            "provider_id",
+            "provider_thread_id",
+            "provider_request_id"
+          ],
+          "isUnique": true
+        },
+        "pending_interactions_thread_created_idx": {
+          "name": "pending_interactions_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_thread_status_created_idx": {
+          "name": "pending_interactions_thread_status_created_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_status_created_idx": {
+          "name": "pending_interactions_status_created_idx",
+          "columns": [
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pending_interactions_thread_id_threads_id_fk": {
+          "name": "pending_interactions_thread_id_threads_id_fk",
+          "tableFrom": "pending_interactions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_execution_defaults": {
+      "name": "project_execution_defaults",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_execution_defaults_project_idx": {
+          "name": "project_execution_defaults_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_execution_defaults_project_id_projects_id_fk": {
+          "name": "project_execution_defaults_project_id_projects_id_fk",
+          "tableFrom": "project_execution_defaults",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_sources": {
+      "name": "project_sources",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_sources_project_idx": {
+          "name": "project_sources_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_host_idx": {
+          "name": "project_sources_host_idx",
+          "columns": [
+            "host_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_project_host_idx": {
+          "name": "project_sources_project_host_idx",
+          "columns": [
+            "project_id",
+            "host_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_sources_project_id_projects_id_fk": {
+          "name": "project_sources_project_id_projects_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_sources_host_id_hosts_id_fk": {
+          "name": "project_sources_host_id_hosts_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "project_sources_shape_check": {
+          "name": "project_sources_shape_check",
+          "value": "(\n        \"project_sources\".\"type\" = 'local_path' AND \"project_sources\".\"host_id\" IS NOT NULL AND \"project_sources\".\"path\" IS NOT NULL\n      )"
+        }
+      }
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'standard'"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'V'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "projects_updated_idx": {
+          "name": "projects_updated_idx",
+          "columns": [
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "projects_deleted_idx": {
+          "name": "projects_deleted_idx",
+          "columns": [
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "projects_sort_idx": {
+          "name": "projects_sort_idx",
+          "columns": [
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "projects_personal_singleton_idx": {
+          "name": "projects_personal_singleton_idx",
+          "columns": [
+            "kind"
+          ],
+          "isUnique": true,
+          "where": "\"projects\".\"kind\" = 'personal'"
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "prompt_history_entries": {
+      "name": "prompt_history_entries",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "request_sequence": {
+          "name": "request_sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "input": {
+          "name": "input",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "prompt_history_entries_thread_request_idx": {
+          "name": "prompt_history_entries_thread_request_idx",
+          "columns": [
+            "thread_id",
+            "request_sequence"
+          ],
+          "isUnique": true
+        },
+        "prompt_history_entries_project_scope_created_idx": {
+          "name": "prompt_history_entries_project_scope_created_idx",
+          "columns": [
+            "project_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "prompt_history_entries_thread_scope_created_idx": {
+          "name": "prompt_history_entries_thread_scope_created_idx",
+          "columns": [
+            "thread_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "prompt_history_entries_project_id_projects_id_fk": {
+          "name": "prompt_history_entries_project_id_projects_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "prompt_history_entries_thread_id_threads_id_fk": {
+          "name": "prompt_history_entries_thread_id_threads_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "queued_thread_messages": {
+      "name": "queued_thread_messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender_thread_id": {
+          "name": "sender_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "claim_token": {
+          "name": "claim_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "queued_thread_messages_thread_created_idx": {
+          "name": "queued_thread_messages_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "queued_thread_messages_thread_sort_idx": {
+          "name": "queued_thread_messages_thread_sort_idx",
+          "columns": [
+            "thread_id",
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "queued_thread_messages_thread_id_threads_id_fk": {
+          "name": "queued_thread_messages_thread_id_threads_id_fk",
+          "tableFrom": "queued_thread_messages",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "system_experiments": {
+      "name": "system_experiments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claude_code_mock_cli_traffic": {
+          "name": "claude_code_mock_cli_traffic",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat": {
+          "name": "popout_chat",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat_hotkey": {
+          "name": "popout_chat_hotkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "terminal_sessions": {
+      "name": "terminal_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "daemon_session_id": {
+          "name": "daemon_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "initial_cwd": {
+          "name": "initial_cwd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cols": {
+          "name": "cols",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rows": {
+          "name": "rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_user_input_at": {
+          "name": "last_user_input_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "terminal_sessions_thread_status_updated_idx": {
+          "name": "terminal_sessions_thread_status_updated_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_environment_status_idx": {
+          "name": "terminal_sessions_environment_status_idx",
+          "columns": [
+            "environment_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_host_status_idx": {
+          "name": "terminal_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_daemon_session_idx": {
+          "name": "terminal_sessions_daemon_session_idx",
+          "columns": [
+            "daemon_session_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminal_sessions_thread_id_threads_id_fk": {
+          "name": "terminal_sessions_thread_id_threads_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_environment_id_environments_id_fk": {
+          "name": "terminal_sessions_environment_id_environments_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_host_id_hosts_id_fk": {
+          "name": "terminal_sessions_host_id_hosts_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk": {
+          "name": "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "host_daemon_sessions",
+          "columnsFrom": [
+            "daemon_session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_dynamic_context_file_states": {
+      "name": "thread_dynamic_context_file_states",
+      "columns": {
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_key": {
+          "name": "file_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_status": {
+          "name": "content_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "shown_at": {
+          "name": "shown_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_dynamic_context_file_states_thread_file_idx": {
+          "name": "thread_dynamic_context_file_states_thread_file_idx",
+          "columns": [
+            "thread_id",
+            "file_key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "thread_dynamic_context_file_states_thread_id_threads_id_fk": {
+          "name": "thread_dynamic_context_file_states_thread_id_threads_id_fk",
+          "tableFrom": "thread_dynamic_context_file_states",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_search_segments": {
+      "name": "thread_search_segments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_kind": {
+          "name": "source_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_key": {
+          "name": "source_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_seq": {
+          "name": "source_seq",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_search_segments_source_idx": {
+          "name": "thread_search_segments_source_idx",
+          "columns": [
+            "thread_id",
+            "source_kind",
+            "source_key"
+          ],
+          "isUnique": true
+        },
+        "thread_search_segments_thread_idx": {
+          "name": "thread_search_segments_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "thread_search_segments_thread_id_threads_id_fk": {
+          "name": "thread_search_segments_thread_id_threads_id_fk",
+          "tableFrom": "thread_search_segments",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "threads": {
+      "name": "threads",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model_override": {
+          "name": "model_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "reasoning_level_override": {
+          "name": "reasoning_level_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title_fallback": {
+          "name": "title_fallback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "folder_path": {
+          "name": "folder_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'starting'"
+        },
+        "parent_thread_id": {
+          "name": "parent_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "source_thread_id": {
+          "name": "source_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "origin_kind": {
+          "name": "origin_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "child_origin": {
+          "name": "child_origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pinned_at": {
+          "name": "pinned_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pin_sort_key": {
+          "name": "pin_sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_read_at": {
+          "name": "last_read_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "latest_attention_at": {
+          "name": "latest_attention_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "threads_project_updated_idx": {
+          "name": "threads_project_updated_idx",
+          "columns": [
+            "project_id",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "threads_project_archived_deleted_idx": {
+          "name": "threads_project_archived_deleted_idx",
+          "columns": [
+            "project_id",
+            "archived_at",
+            "deleted_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "threads_pin_sort_idx": {
+          "name": "threads_pin_sort_idx",
+          "columns": [
+            "archived_at",
+            "deleted_at",
+            "pin_sort_key",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"pinned_at\" IS NOT NULL"
+        },
+        "threads_environment_idx": {
+          "name": "threads_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "threads_parent_idx": {
+          "name": "threads_parent_idx",
+          "columns": [
+            "parent_thread_id"
+          ],
+          "isUnique": false
+        },
+        "threads_source_origin_idx": {
+          "name": "threads_source_origin_idx",
+          "columns": [
+            "source_thread_id",
+            "origin_kind"
+          ],
+          "isUnique": false
+        },
+        "threads_archived_status_idx": {
+          "name": "threads_archived_status_idx",
+          "columns": [
+            "archived_at",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "threads_environment_archived_deleted_idx": {
+          "name": "threads_environment_archived_deleted_idx",
+          "columns": [
+            "environment_id",
+            "archived_at",
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "threads_active_maintenance_idx": {
+          "name": "threads_active_maintenance_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"deleted_at\" IS NULL"
+        }
+      },
+      "foreignKeys": {
+        "threads_project_id_projects_id_fk": {
+          "name": "threads_project_id_projects_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "threads_environment_id_environments_id_fk": {
+          "name": "threads_environment_id_environments_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_parent_thread_id_threads_id_fk": {
+          "name": "threads_parent_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "parent_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_source_thread_id_threads_id_fk": {
+          "name": "threads_source_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "source_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index 22a5cc02e..ad598da05 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -295,6 +295,13 @@
       "when": 1781660000003,
       "tag": "0041_add_automations",
       "breakpoints": true
+    },
+    {
+      "idx": 42,
+      "version": "6",
+      "when": 1781849421982,
+      "tag": "0042_thread_folder_path",
+      "breakpoints": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index c8007a9bf..987381560 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -243,6 +243,7 @@ export interface CreateThreadInput {
   providerId: string;
   title?: string | null;
   titleFallback?: string | null;
+  folderPath?: string | null;
   status?: ThreadStatus;
   parentThreadId?: string | null;
   sourceThreadId?: string | null;
@@ -270,6 +271,7 @@ export function createThread(
           providerId: input.providerId,
           title: input.title ?? null,
           titleFallback: input.titleFallback ?? null,
+          folderPath: input.folderPath ?? null,
           status: input.status ?? "starting",
           parentThreadId:
             originKind === null ? input.parentThreadId ?? null : null,
@@ -1507,6 +1509,7 @@ export function reorderPinnedThread({
 
 export interface UpdateThreadInput {
   environmentId?: string | null;
+  folderPath?: string | null;
   lastReadAt?: number | null;
   parentThreadId?: string | null;
   title?: string | null;
@@ -1525,7 +1528,7 @@ export function updateThread(
   }
 
   const changes: ThreadChangeKind[] = [];
-  if ("title" in input) changes.push("title-changed");
+  if ("title" in input || "folderPath" in input) changes.push("title-changed");
   if ("lastReadAt" in input) changes.push("read-state-changed");
   if (
     "parentThreadId" in input &&
@@ -1542,6 +1545,7 @@ export function updateThread(
 
   const set: Partial<typeof threads.$inferInsert> = { updatedAt: now };
   if ("title" in input) set.title = input.title;
+  if ("folderPath" in input) set.folderPath = input.folderPath;
   if ("environmentId" in input) set.environmentId = input.environmentId;
   if ("lastReadAt" in input) {
     set.lastReadAt = input.lastReadAt;
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index 2856f3837..75f685c79 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -249,6 +249,7 @@ export const threads = sqliteTable(
     ).$type<ReasoningLevel>(),
     title: text("title"),
     titleFallback: text("title_fallback"),
+    folderPath: text("folder_path"),
     status: text("status", { enum: threadStatusValues })
       .notNull()
       .default("starting"),
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index e0e8c07a7..6a9ce2cce 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -600,6 +600,32 @@ describe("threads", () => {
     expect(updated?.title).toBe("New title");
   });
 
+  it("updates thread folder path", () => {
+    const { db, project } = setup();
+    const spy: DbNotifier = {
+      notifyThread: vi.fn(),
+      notifyEnvironment: vi.fn(),
+      notifyHost: vi.fn(),
+      notifyProject: vi.fn(),
+      notifySystem: vi.fn(),
+    };
+    const thread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+    });
+
+    const updated = updateThread(db, spy, thread.id, {
+      folderPath: "Work/Q3",
+    });
+
+    expect(updated?.folderPath).toBe("Work/Q3");
+    expect(spy.notifyThread).toHaveBeenCalledWith(
+      thread.id,
+      ["title-changed"],
+      { projectId: project.id },
+    );
+  });
+
   it("notifies when a thread parent changes", () => {
     const { db, project } = setup();
     const spy: DbNotifier = {
diff --git a/packages/domain/src/thread.ts b/packages/domain/src/thread.ts
index d3f91c9b0..6e3856c6c 100644
--- a/packages/domain/src/thread.ts
+++ b/packages/domain/src/thread.ts
@@ -369,6 +369,7 @@ export const threadSchema = z.object({
   providerId: z.string(),
   title: z.string().nullable(),
   titleFallback: z.string().nullable(),
+  folderPath: z.string().nullable(),
   status: threadStatusSchema,
   parentThreadId: z.string().nullable(),
   sourceThreadId: z.string().nullable(),
diff --git a/packages/server-contract/src/api/threads.ts b/packages/server-contract/src/api/threads.ts
index 17d34c4cd..255fd614c 100644
--- a/packages/server-contract/src/api/threads.ts
+++ b/packages/server-contract/src/api/threads.ts
@@ -311,6 +311,7 @@ export type DeleteThreadRequest = z.infer<typeof deleteThreadRequestSchema>;
 export const updateThreadRequestSchema = z
   .object({
     title: z.string().min(1).nullable(),
+    folderPath: z.string().min(1).nullable(),
     parentThreadId: z.string().min(1).nullable(),
     // Sticky thread-level execution overrides applied on the next turn. `null`
     // clears the override; an omitted field is left unchanged. Settable
@@ -322,6 +323,7 @@ export const updateThreadRequestSchema = z
   .refine(
     (value) =>
       value.title !== undefined ||
+      value.folderPath !== undefined ||
       value.parentThreadId !== undefined ||
       value.model !== undefined ||
       value.reasoningLevel !== undefined,
diff --git a/packages/server-contract/test/contract.test.ts b/packages/server-contract/test/contract.test.ts
index 50f7e4011..7a0a3ea6d 100644
--- a/packages/server-contract/test/contract.test.ts
+++ b/packages/server-contract/test/contract.test.ts
@@ -143,6 +143,7 @@ const OPTIONAL_SERVER_FIELD_GROUPS: readonly OptionalServerFieldGroup[] = [
       "Thread PATCH requests omit fields that should be left unchanged; null explicitly clears nullable values.",
     fields: [
       "updateThreadRequestSchema.model",
+      "updateThreadRequestSchema.folderPath",
       "updateThreadRequestSchema.parentThreadId",
       "updateThreadRequestSchema.reasoningLevel",
       "updateThreadRequestSchema.title",
@@ -720,6 +721,7 @@ describe("server-contract canonical schemas", () => {
           providerId: "codex",
           title: "Pending thread",
           titleFallback: "Pending thread",
+          folderPath: null,
           status: "idle",
           parentThreadId: null,
           sourceThreadId: null,

From 8ef0f569736ca54907c23dfc81353ad8afe8351e Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Thu, 18 Jun 2026 23:49:05 -0700
Subject: [PATCH 13/54] Add explicit sidebar folder creation

---
 .../dialogs/ThreadFolderCreateDialog.tsx      |  116 +
 .../src/components/sidebar/ProjectList.tsx    |   76 +-
 .../sidebar/ProjectListProjects.tsx           |    3 +
 .../app/src/components/sidebar/ProjectRow.tsx |   26 +-
 .../sidebar/SidebarOverview.stories.tsx       |    1 +
 .../sidebar/projectThreadGroups.test.ts       |   16 +
 .../components/sidebar/projectThreadGroups.ts |   72 +-
 .../app/src/hooks/cache-owners/query-cache.ts |    1 +
 .../thread-state-cache-owner.test.ts          |    1 +
 .../mutations/thread-folder-mutations.ts      |   19 +
 .../mutations/thread-state-mutations.test.tsx |    1 +
 apps/app/src/lib/api.ts                       |   10 +
 apps/app/src/views/RootComposeView.test.ts    |    1 +
 apps/server/src/routes/projects.ts            |    2 +
 apps/server/src/routes/thread-folders.ts      |   29 +
 apps/server/src/server.ts                     |    2 +
 .../drizzle/0043_unique_phantom_reporter.sql  |    9 +
 packages/db/drizzle/meta/0043_snapshot.json   | 2785 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    7 +
 packages/db/src/data/index.ts                 |   12 +
 packages/db/src/data/thread-folders.ts        |  118 +
 packages/db/src/data/threads.ts               |    7 +-
 packages/db/src/ids.ts                        |    4 +
 packages/db/src/schema.ts                     |   14 +
 packages/db/test/data/threads.test.ts         |   22 +
 packages/server-contract/src/api/projects.ts  |   20 +
 packages/server-contract/src/public-api.ts    |   14 +
 27 files changed, 3362 insertions(+), 26 deletions(-)
 create mode 100644 apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
 create mode 100644 apps/app/src/hooks/mutations/thread-folder-mutations.ts
 create mode 100644 apps/server/src/routes/thread-folders.ts
 create mode 100644 packages/db/drizzle/0043_unique_phantom_reporter.sql
 create mode 100644 packages/db/drizzle/meta/0043_snapshot.json
 create mode 100644 packages/db/src/data/thread-folders.ts

diff --git a/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx b/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
new file mode 100644
index 000000000..406984e1b
--- /dev/null
+++ b/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
@@ -0,0 +1,116 @@
+import { useId, useState, type FormEvent, type RefObject } from "react";
+import { Button } from "@/components/ui/button.js";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog.js";
+import { Input } from "@/components/ui/input.js";
+import { normalizeFolderPath } from "@/components/sidebar/folderPath";
+import { useNameValidation } from "./useNameValidation.js";
+import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
+
+interface ThreadFolderCreateDialogProps {
+  open: boolean;
+  pending?: boolean;
+  onOpenChange: (open: boolean) => void;
+  onCreate: (path: string) => void;
+}
+
+interface ThreadFolderCreateDialogContentProps {
+  pending: boolean;
+  onCreate: (path: string) => void;
+  inputRef: RefObject<HTMLInputElement | null>;
+}
+
+export function ThreadFolderCreateDialog({
+  open,
+  pending = false,
+  onOpenChange,
+  onCreate,
+}: ThreadFolderCreateDialogProps) {
+  const { inputRef, handleOpenAutoFocus } = useRenameDialogAutoFocus();
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent onOpenAutoFocus={handleOpenAutoFocus}>
+        {open ? (
+          <ThreadFolderCreateDialogContent
+            pending={pending}
+            onCreate={onCreate}
+            inputRef={inputRef}
+          />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function ThreadFolderCreateDialogContent({
+  pending,
+  onCreate,
+  inputRef,
+}: ThreadFolderCreateDialogContentProps) {
+  const inputId = useId();
+  const [path, setPath] = useState("");
+  const [folderPathMessage, setFolderPathMessage] = useState<string | null>(
+    null,
+  );
+  const { validationMessage, validate, clearMessage } = useNameValidation({
+    emptyMessage: "Folder name cannot be empty.",
+  });
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (pending) return;
+
+    const trimmedPath = validate(path);
+    if (trimmedPath === null) return;
+    const normalizedPath = normalizeFolderPath(trimmedPath);
+    if (normalizedPath === null) {
+      setFolderPathMessage("Folder name cannot be empty.");
+      return;
+    }
+
+    onCreate(normalizedPath);
+  };
+  const displayedMessage = validationMessage ?? folderPathMessage;
+
+  return (
+    <>
+      <DialogHeader>
+        <DialogTitle>New folder</DialogTitle>
+        <DialogDescription>Create a folder for threads.</DialogDescription>
+      </DialogHeader>
+      <form className="space-y-4" onSubmit={handleSubmit}>
+        <div className="space-y-2">
+          <Input
+            ref={inputRef}
+            id={inputId}
+            aria-label="Folder name"
+            value={path}
+            autoCapitalize="sentences"
+            autoCorrect="off"
+            spellCheck={false}
+            disabled={pending}
+            onChange={(event) => {
+              setPath(event.target.value);
+              setFolderPathMessage(null);
+              clearMessage();
+            }}
+          />
+          {displayedMessage ? (
+            <p className="text-sm text-destructive">{displayedMessage}</p>
+          ) : null}
+        </div>
+        <DialogFooter>
+          <Button type="submit" disabled={pending}>
+            Create folder
+          </Button>
+        </DialogFooter>
+      </form>
+    </>
+  );
+}
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index cd7b974e8..674e77463 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -32,6 +32,7 @@ import { stripProjectThreads } from "@/hooks/queries/project-queries";
 import { useSidebarNavigation } from "@/hooks/queries/sidebar-navigation-query";
 import { useReorderProject } from "@/hooks/mutations/project-mutations";
 import { useReorderPinnedThread } from "@/hooks/mutations/thread-state-mutations";
+import { useCreateThreadFolder } from "@/hooks/mutations/thread-folder-mutations";
 import {
   isLocalPathMissing,
   useLocalPathExistence,
@@ -48,6 +49,7 @@ import {
 import { useSetRootComposeProjectId } from "@/lib/root-compose-selection";
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button.js";
+import { ThreadFolderCreateDialog } from "@/components/dialogs/ThreadFolderCreateDialog";
 import { CHROME_SECTION_LABEL_CLASS } from "@/components/ui/chromeStyleTokens";
 import { Icon, type IconName } from "@/components/ui/icon.js";
 import { Skeleton } from "@/components/ui/skeleton.js";
@@ -170,6 +172,8 @@ interface ProjectListProjectsSectionActionsProps {
 }
 
 interface ProjectListThreadsSectionActionsProps {
+  isCreatingFolder: boolean;
+  onNewFolder: () => void;
   onNewThread: () => void;
 }
 
@@ -335,6 +339,7 @@ const EMPTY_PROJECT_THREAD_LIST_STATE: ProjectThreadListState = {
 };
 
 const EMPTY_PROJECTS: readonly ProjectResponse[] = [];
+const EMPTY_FOLDER_PATHS: readonly string[] = [];
 
 function getProjectId(project: ProjectResponse): string {
   return project.id;
@@ -434,15 +439,26 @@ function ProjectListProjectsSectionActions({
 }
 
 function ProjectListThreadsSectionActions({
+  isCreatingFolder,
+  onNewFolder,
   onNewThread,
 }: ProjectListThreadsSectionActionsProps) {
   return (
-    <ProjectListSectionIconButton
-      ariaLabel="New thread"
-      title="New thread"
-      iconName="MessageSquarePlus"
-      onClick={onNewThread}
-    />
+    <>
+      <ProjectListSectionIconButton
+        ariaLabel="New folder"
+        title="New folder"
+        disabled={isCreatingFolder}
+        iconName="FolderPlus"
+        onClick={onNewFolder}
+      />
+      <ProjectListSectionIconButton
+        ariaLabel="New thread"
+        title="New thread"
+        iconName="MessageSquarePlus"
+        onClick={onNewThread}
+      />
+    </>
   );
 }
 
@@ -739,11 +755,11 @@ function TopLevelSidebarSection({
         <span
           className={cn(
             "relative z-10 flex min-w-0 flex-1 items-center gap-1 text-left",
-            actions && "pr-[5.75rem] max-md:pointer-coarse:pr-[7.25rem]",
+            actions && "pr-[7.5rem] max-md:pointer-coarse:pr-[9.75rem]",
           )}
         >
           <span className="min-w-0 truncate">{label}</span>
-          {/* Reserve room for up to three section action buttons on the right;
+          {/* Reserve room for up to four section action buttons on the right;
               coarse pointers need a little more. */}
           {collapseControl ? (
             <button
@@ -957,6 +973,12 @@ function ProjectListComponent({
   const setRootComposeProjectId = useSetRootComposeProjectId();
   const sidebarNavigationQuery = useSidebarNavigation();
   const sidebarNavigation = sidebarNavigationQuery.data;
+  const folderPaths = useMemo(
+    () =>
+      sidebarNavigation?.folders.map((folder) => folder.path) ??
+      EMPTY_FOLDER_PATHS,
+    [sidebarNavigation],
+  );
   const projects = useMemo(
     () => sidebarNavigation?.projects.map(stripProjectThreads),
     [sidebarNavigation],
@@ -1035,6 +1057,10 @@ function ProjectListComponent({
     isPending: isPinnedReorderPending,
     mutate: reorderPinnedThreadMutate,
   } = useReorderPinnedThread();
+  const {
+    isPending: isCreateThreadFolderPending,
+    mutate: createThreadFolderMutate,
+  } = useCreateThreadFolder();
   const projectItems = projects ?? EMPTY_PROJECTS;
   const handleReorderProject = useCallback<
     UseNeighborReorderSortableArgs<ProjectResponse>["onReorder"]
@@ -1105,6 +1131,25 @@ function ProjectListComponent({
   const handleCreateProjectlessThread = useCallback(() => {
     openRootComposeForProject(PERSONAL_PROJECT_ID);
   }, [openRootComposeForProject]);
+  const [isFolderCreateDialogOpen, setIsFolderCreateDialogOpen] =
+    useState(false);
+  const handleOpenCreateFolderDialog = useCallback(() => {
+    setIsFolderCreateDialogOpen(true);
+  }, []);
+  const handleCreateFolderDialogOpenChange = useCallback((open: boolean) => {
+    setIsFolderCreateDialogOpen(open);
+  }, []);
+  const handleCreateThreadFolder = useCallback(
+    (path: string) => {
+      createThreadFolderMutate(
+        { path },
+        {
+          onSuccess: () => setIsFolderCreateDialogOpen(false),
+        },
+      );
+    },
+    [createThreadFolderMutate],
+  );
   const handleOpenProjectlessArchivedThreads = useCallback(() => {
     onProjectSelect?.();
     navigate(getProjectlessArchivedRoutePath());
@@ -1529,6 +1574,7 @@ function ProjectListComponent({
       compareThreads={sidebarThreadComparator}
       onProjectSelect={onProjectSelect}
       onCreateProjectThread={handleCreateProjectThread}
+      folderPaths={folderPaths}
       onToggleProjectCollapsed={toggleProjectCollapsed}
       onToggleThreadCollapsed={toggleThreadCollapsed}
       onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
@@ -1543,6 +1589,7 @@ function ProjectListComponent({
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
       compareThreads={sidebarThreadComparator}
+      folderPaths={folderPaths}
       variant="section"
       onProjectSelect={onProjectSelect}
       onToggleThreadCollapsed={toggleThreadCollapsed}
@@ -1553,6 +1600,7 @@ function ProjectListComponent({
     <ChronologicalThreadTree
       threadListState={allThreadsListState}
       compareThreads={sidebarThreadComparator}
+      folderPaths={folderPaths}
       selectedThreadId={selectedThreadId}
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
@@ -1592,10 +1640,20 @@ function ProjectListComponent({
         onOpenChange={handleThreadsViewOptionsMenuOpenChange}
       />
       <ProjectListThreadsSectionActions
+        isCreatingFolder={isCreateThreadFolderPending}
+        onNewFolder={handleOpenCreateFolderDialog}
         onNewThread={handleCreateProjectlessThread}
       />
     </>
   );
+  const folderCreateDialog = (
+    <ThreadFolderCreateDialog
+      open={isFolderCreateDialogOpen}
+      pending={isCreateThreadFolderPending}
+      onOpenChange={handleCreateFolderDialogOpenChange}
+      onCreate={handleCreateThreadFolder}
+    />
+  );
 
   if (threadSearch?.isActive) {
     return (
@@ -1646,6 +1704,7 @@ function ProjectListComponent({
             {allThreadsSectionContent}
           </TopLevelSidebarSection>
         </div>
+        {folderCreateDialog}
       </ProjectListShell>
     );
   }
@@ -1718,6 +1777,7 @@ function ProjectListComponent({
           </div>
         </SortableContext>
       </DndContext>
+      {folderCreateDialog}
     </ProjectListShell>
   );
 }
diff --git a/apps/app/src/components/sidebar/ProjectListProjects.tsx b/apps/app/src/components/sidebar/ProjectListProjects.tsx
index f0c168b04..3c0f6f8d6 100644
--- a/apps/app/src/components/sidebar/ProjectListProjects.tsx
+++ b/apps/app/src/components/sidebar/ProjectListProjects.tsx
@@ -51,6 +51,7 @@ export interface ProjectListProjectsProps {
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
   compareThreads: ThreadComparator;
+  folderPaths?: readonly string[];
   onProjectSelect?: () => void;
   onCreateProjectThread?: (projectId: string) => void;
   onToggleProjectCollapsed: (projectId: string) => void;
@@ -99,6 +100,7 @@ export function ProjectListProjects({
   collapsedThreadIds,
   collapsedEnvironmentIds,
   compareThreads,
+  folderPaths,
   onProjectSelect,
   onCreateProjectThread,
   onToggleProjectCollapsed,
@@ -109,6 +111,7 @@ export function ProjectListProjects({
   const sharedRowProps = (row: ProjectListRowModel) => ({
     project: row.project,
     threadListState: row.threadListState,
+    folderPaths,
     selectedThreadId,
     isActive: row.isActive,
     isCollapsed: collapsedProjectIds.has(row.project.id),
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index ba7dd5881..0924ef60f 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -13,7 +13,7 @@ import {
   SortableContext,
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import type { ThreadListEntry } from "@bb/domain";
+import { PERSONAL_PROJECT_ID, type ThreadListEntry } from "@bb/domain";
 import type { ProjectResponse } from "@bb/server-contract";
 import { NavLink, useNavigate } from "react-router-dom";
 import { useCreateThreadInWorktree } from "@/hooks/useCreateThreadInWorktree";
@@ -126,6 +126,7 @@ export type ProjectThreadListState =
 export interface ProjectRowProps {
   project: ProjectResponse;
   threadListState: ProjectThreadListState;
+  folderPaths?: readonly string[];
   selectedThreadId?: string;
   isActive: boolean;
   isCollapsed: boolean;
@@ -148,6 +149,7 @@ export interface ProjectThreadTreeProps {
   projectId: string;
   threadListState: ProjectThreadListState;
   compareThreads: ThreadComparator;
+  folderPaths?: readonly string[];
   selectedThreadId?: string;
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
@@ -160,6 +162,7 @@ export interface ProjectThreadTreeProps {
 export interface ChronologicalThreadTreeProps {
   threadListState: ProjectThreadListState;
   compareThreads: ThreadComparator;
+  folderPaths?: readonly string[];
   selectedThreadId?: string;
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
@@ -174,6 +177,7 @@ type ProjectItemClickCaptureHandler = MouseEventHandler<HTMLLIElement>;
 type ProjectThreadListClickCaptureHandler = MouseEventHandler<HTMLDivElement>;
 
 const EMPTY_PROJECT_THREADS: ThreadListEntry[] = [];
+const EMPTY_FOLDER_PATHS: readonly string[] = [];
 const PROJECT_ROW_LEADING_SLOT_CLASS =
   "h-7 w-8 max-md:pointer-coarse:h-10 max-md:pointer-coarse:w-10";
 
@@ -286,6 +290,9 @@ export function getItemProjectId(item: ProjectThreadItem): string {
     case "environment":
       return item.group.nodes[0].thread.projectId;
     case "folder":
+      if (item.group.items.length === 0) {
+        return PERSONAL_PROJECT_ID;
+      }
       return getItemProjectId(item.group.items[0]);
   }
 }
@@ -1284,7 +1291,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
         onToggleCollapsed={handleToggleCollapsed}
         stickyLevel={stickyLevel}
       />
-      {!isCollapsed ? (
+      {!isCollapsed && folder.items.length > 0 ? (
         <div className="relative space-y-px">
           <ThreadTreeGroupLine parentRowDepth={headerDepth} />
           <ManualSortableList manualSort={manualSort} parentKey={folder.key}>
@@ -1441,6 +1448,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   projectId,
   threadListState,
   compareThreads,
+  folderPaths = EMPTY_FOLDER_PATHS,
   selectedThreadId,
   collapsedThreadIds,
   collapsedEnvironmentIds,
@@ -1459,8 +1467,9 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
       buildProjectThreadGroups(projectThreads, compareThreads, {
         groupBy,
         containerId: projectId,
+        folderPaths,
       }),
-    [compareThreads, projectThreads, groupBy, projectId],
+    [compareThreads, projectThreads, groupBy, projectId, folderPaths],
   );
   const manualSort = useManualThreadTreeDnd({
     containerId: projectId,
@@ -1476,7 +1485,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
     );
   }
 
-  if (projectThreads.length === 0) {
+  if (rootItems.length === 0) {
     const emptyState = (
       <EmptyState
         message={
@@ -1545,6 +1554,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
 export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   threadListState,
   compareThreads,
+  folderPaths = EMPTY_FOLDER_PATHS,
   selectedThreadId,
   collapsedThreadIds,
   collapsedEnvironmentIds,
@@ -1562,8 +1572,9 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
       buildChronologicalThreadList(threads, compareThreads, {
         groupBy,
         containerId: CHRONOLOGICAL_CONTAINER_ID,
+        folderPaths,
       }),
-    [threads, compareThreads, groupBy],
+    [threads, compareThreads, groupBy, folderPaths],
   );
   const manualSort = useManualThreadTreeDnd({
     containerId: CHRONOLOGICAL_CONTAINER_ID,
@@ -1579,7 +1590,7 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
     );
   }
 
-  if (threads.length === 0) {
+  if (rootItems.length === 0) {
     return (
       <EmptyState
         message={
@@ -1636,6 +1647,7 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
 function ProjectRowComponent({
   project,
   threadListState,
+  folderPaths = EMPTY_FOLDER_PATHS,
   selectedThreadId,
   isActive,
   isCollapsed,
@@ -1803,6 +1815,7 @@ function ProjectRowComponent({
           <ProjectThreadTree
             projectId={project.id}
             threadListState={threadListState}
+            folderPaths={folderPaths}
             selectedThreadId={selectedThreadId}
             collapsedThreadIds={collapsedThreadIds}
             collapsedEnvironmentIds={collapsedEnvironmentIds}
@@ -1896,6 +1909,7 @@ function areProjectRowPropsEqual(
   if (
     prev.project !== next.project ||
     prev.threadListState !== next.threadListState ||
+    prev.folderPaths !== next.folderPaths ||
     prev.isActive !== next.isActive ||
     prev.isCollapsed !== next.isCollapsed ||
     prev.compareThreads !== next.compareThreads ||
diff --git a/apps/app/src/components/sidebar/SidebarOverview.stories.tsx b/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
index 3a1ca1776..c08fdbd11 100644
--- a/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
@@ -54,6 +54,7 @@ const personalProject = makeProject({
 });
 
 const loadedSidebarNavigation = {
+  folders: [],
   personalProject: {
     ...personalProject,
     defaultExecutionOptions: null,
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
index 0bcc7de3c..8108ec228 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.test.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -565,6 +565,22 @@ describe("folder bucketing", () => {
     expect(summarizeItems(items)).toEqual(["a", "b"]);
   });
 
+  it("renders explicit empty folders without a thread using that path", () => {
+    const items = buildProjectThreadGroups(
+      [createThread({ id: "a", title: "Standalone" })],
+      compareStandardThreads,
+      {
+        ...FOLDER_OPTIONS,
+        folderPaths: ["Work/Q3"],
+      },
+    );
+
+    expect(summarizeItems(items)).toEqual([
+      { folder: "proj_1::Work", items: [{ folder: "proj_1::Work/Q3", items: [] }] },
+      "a",
+    ]);
+  });
+
   it("keeps a folder thread's own children nested under it and ignores their slashes", () => {
     const items = buildProjectThreadGroups(
       [
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.ts b/apps/app/src/components/sidebar/projectThreadGroups.ts
index 79fa7db70..284a19a2c 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.ts
@@ -66,6 +66,7 @@ export type ProjectThreadItem =
 export interface SidebarFolderOptions {
   groupBy: SidebarGroupBy;
   containerId: string;
+  folderPaths?: readonly string[];
   manualOrder?: SidebarManualOrder;
 }
 
@@ -374,6 +375,7 @@ export function buildProjectThreadGroups(
     folderOptions.containerId,
     compareThreads,
     folderOptions.manualOrder,
+    folderOptions.folderPaths,
   );
 }
 
@@ -422,6 +424,7 @@ export function buildChronologicalThreadList(
     folderOptions.containerId,
     compareThreads,
     folderOptions.manualOrder,
+    folderOptions.folderPaths,
   );
 }
 
@@ -509,16 +512,21 @@ function createFolderBucket(): FolderBucket {
 function getItemOrderingThread(
   item: ProjectThreadItem,
   compareThreads: ThreadComparator,
-): ThreadListEntry {
+): ThreadListEntry | null {
   switch (item.kind) {
     case "thread":
       return item.node.thread;
     case "environment":
       return item.group.nodes[0].thread;
-    case "folder":
-      return getItemThreadDescendants(item.group.items).reduce(
+    case "folder": {
+      const descendants = getItemThreadDescendants(item.group.items);
+      if (descendants.length === 0) {
+        return null;
+      }
+      return descendants.reduce(
         (first, thread) => (compareThreads(thread, first) < 0 ? thread : first),
       );
+    }
   }
 }
 
@@ -573,10 +581,7 @@ function orderItemsByManualOrder(
   const unorderedItems = items
     .filter((item) => !orderedKeys.has(getManualOrderItemKey(item)))
     .sort((left, right) =>
-      compareThreads(
-        getItemOrderingThread(left, compareThreads),
-        getItemOrderingThread(right, compareThreads),
-      ),
+      compareSiblingItems(left, right, compareThreads),
     );
   const orderedItems = prunedOrder.flatMap((key) => {
     const item = itemsByKey.get(key);
@@ -607,17 +612,46 @@ function orderSiblingItems(
   const decorated = items.map((item) => ({
     item,
     isFolder: item.kind === "folder",
-    orderingThread: getItemOrderingThread(item, compareThreads),
   }));
   decorated.sort((left, right) => {
     if (left.isFolder !== right.isFolder) {
       return left.isFolder ? -1 : 1;
     }
-    return compareThreads(left.orderingThread, right.orderingThread);
+    return compareSiblingItems(left.item, right.item, compareThreads);
   });
   return decorated.map((entry) => entry.item);
 }
 
+function getItemFallbackSortLabel(item: ProjectThreadItem): string {
+  switch (item.kind) {
+    case "thread":
+      return item.node.thread.id;
+    case "environment":
+      return item.group.environmentId;
+    case "folder":
+      return item.group.path.join("/");
+  }
+}
+
+function compareSiblingItems(
+  left: ProjectThreadItem,
+  right: ProjectThreadItem,
+  compareThreads: ThreadComparator,
+): number {
+  const leftThread = getItemOrderingThread(left, compareThreads);
+  const rightThread = getItemOrderingThread(right, compareThreads);
+  if (leftThread && rightThread) {
+    return compareThreads(leftThread, rightThread);
+  }
+  if (leftThread || rightThread) {
+    return leftThread ? -1 : 1;
+  }
+  return compareCodepoint(
+    getItemFallbackSortLabel(left),
+    getItemFallbackSortLabel(right),
+  );
+}
+
 function buildFolderGroup(
   containerId: string,
   path: string[],
@@ -671,17 +705,33 @@ function buildFolderLevelItems(
 
 // Fold a top-level item list into a nested folder tree. Items whose
 // representative thread has no folderPath stay loose at the top level; the rest
-// nest into the deepest folder of their path. No empty folders: a folder node
-// exists only because >=1 item resolved into it.
+// nest into the deepest folder of their path. Explicit folder paths can create
+// empty folder nodes so new folders exist before their first thread is dropped.
 export function bucketIntoFolders(
   items: readonly ProjectThreadItem[],
   containerId: string,
   compareThreads: ThreadComparator = compareStandardThreads,
   manualOrder?: SidebarManualOrder,
+  folderPaths: readonly string[] = [],
 ): ProjectThreadItem[] {
   const root = createFolderBucket();
+  for (const folderPath of folderPaths) {
+    const folders = splitFolderPath(folderPath);
+    let bucket = root;
+    for (const segment of folders) {
+      let next = bucket.subfolders.get(segment);
+      if (!next) {
+        next = createFolderBucket();
+        bucket.subfolders.set(segment, next);
+      }
+      bucket = next;
+    }
+  }
   for (const item of items) {
     const orderingThread = getItemOrderingThread(item, compareThreads);
+    if (!orderingThread) {
+      continue;
+    }
     const folders = splitFolderPath(orderingThread.folderPath);
     let bucket = root;
     for (const segment of folders) {
diff --git a/apps/app/src/hooks/cache-owners/query-cache.ts b/apps/app/src/hooks/cache-owners/query-cache.ts
index 256d46910..3c7d7915e 100644
--- a/apps/app/src/hooks/cache-owners/query-cache.ts
+++ b/apps/app/src/hooks/cache-owners/query-cache.ts
@@ -248,6 +248,7 @@ export function applyToCachedSidebarNavigationThreads({
         return currentNavigation;
       }
       return {
+        folders: currentNavigation.folders,
         projects: currentNavigation.projects.map((project) =>
           mapSidebarNavigationProjectThreads(project, mapper),
         ),
diff --git a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
index 1fdc6401d..8f37cd132 100644
--- a/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
+++ b/apps/app/src/hooks/cache-owners/thread-state-cache-owner.test.ts
@@ -63,6 +63,7 @@ function makeSidebarNavigation(
   threads: ThreadListEntry[],
 ): SidebarBootstrapResponse {
   return {
+    folders: [],
     projects: [
       {
         id: "project-1",
diff --git a/apps/app/src/hooks/mutations/thread-folder-mutations.ts b/apps/app/src/hooks/mutations/thread-folder-mutations.ts
new file mode 100644
index 000000000..e2122eb71
--- /dev/null
+++ b/apps/app/src/hooks/mutations/thread-folder-mutations.ts
@@ -0,0 +1,19 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import type { CreateThreadFolderRequest } from "@bb/server-contract";
+import * as api from "@/lib/api";
+import { invalidateProjectListQueries } from "../cache-owners/mutation-cache-effects";
+
+export function useCreateThreadFolder() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    meta: {
+      errorMessage: "Failed to create folder.",
+    },
+    mutationFn: (request: CreateThreadFolderRequest) =>
+      api.createThreadFolder(request),
+    onSuccess: () => {
+      invalidateProjectListQueries({ queryClient });
+    },
+  });
+}
diff --git a/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx b/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
index a46ce0a18..50c6c02f8 100644
--- a/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
+++ b/apps/app/src/hooks/mutations/thread-state-mutations.test.tsx
@@ -84,6 +84,7 @@ function makeSidebarNavigation(
   threads: ThreadListEntry[],
 ): SidebarBootstrapResponse {
   return {
+    folders: [],
     projects: [
       {
         id: "project-1",
diff --git a/apps/app/src/lib/api.ts b/apps/app/src/lib/api.ts
index baf1a30a0..0d0000ff4 100644
--- a/apps/app/src/lib/api.ts
+++ b/apps/app/src/lib/api.ts
@@ -18,6 +18,7 @@ import type {
   CommandListResponse,
   CreateProjectSourceRequest,
   CreateProjectRequest,
+  CreateThreadFolderRequest,
   CreateQueuedMessageRequest,
   DeleteThreadRequest,
   EnvironmentArchiveThreadsResponse,
@@ -50,6 +51,7 @@ import type {
   SystemVoiceTranscriptionResponse,
   ThreadArchiveAllResponse,
   ThreadChildSummaryResponse,
+  ThreadFolderResponse,
   ThreadPendingInteractionsResponse,
   ThreadQueuedMessageListResponse,
   ThreadListResponse,
@@ -480,6 +482,14 @@ export async function createProject(
   return request<ProjectResponse>(apiClient.projects.$post({ json: req }));
 }
 
+export async function createThreadFolder(
+  req: CreateThreadFolderRequest,
+): Promise<ThreadFolderResponse> {
+  return request<ThreadFolderResponse>(
+    apiClient["thread-folders"].$post({ json: req }),
+  );
+}
+
 export async function updateProject(
   id: string,
   req: UpdateProjectRequest,
diff --git a/apps/app/src/views/RootComposeView.test.ts b/apps/app/src/views/RootComposeView.test.ts
index e9ecf4ed5..572b87861 100644
--- a/apps/app/src/views/RootComposeView.test.ts
+++ b/apps/app/src/views/RootComposeView.test.ts
@@ -99,6 +99,7 @@ function makeProject(args: MakeProjectArgs): ProjectWithThreadsResponse {
 describe("buildMobileRecentThreads", () => {
   it("includes projectless and every project thread", () => {
     const sidebarNavigation: SidebarBootstrapResponse = {
+      folders: [],
       personalProject: makeProject({
         id: PERSONAL_PROJECT_ID,
         kind: "personal",
diff --git a/apps/server/src/routes/projects.ts b/apps/server/src/routes/projects.ts
index 9c4487458..d55fa05cc 100644
--- a/apps/server/src/routes/projects.ts
+++ b/apps/server/src/routes/projects.ts
@@ -9,6 +9,7 @@ import {
   listProjectExecutionDefaultsByProjectIds,
   listPublicProjects,
   listProjectSourcesByProjectIds,
+  listThreadFolders,
   listThreadsWithPendingInteractionStateForProjects,
   reorderProject,
   updateProject,
@@ -235,6 +236,7 @@ function buildSidebarBootstrapResponse(deps: AppDeps) {
     );
   }
   return {
+    folders: listThreadFolders(deps.db),
     projects: buildProjectsWithThreadsResponseFromRows(
       deps,
       listPublicProjects(deps.db),
diff --git a/apps/server/src/routes/thread-folders.ts b/apps/server/src/routes/thread-folders.ts
new file mode 100644
index 000000000..7d730a63d
--- /dev/null
+++ b/apps/server/src/routes/thread-folders.ts
@@ -0,0 +1,29 @@
+import { createThreadFolder, normalizeThreadFolderPath } from "@bb/db";
+import {
+  publicApiRoutes,
+  typedRoutes,
+  type PublicApiSchema,
+} from "@bb/server-contract";
+import type { Hono } from "hono";
+import type { AppDeps } from "../types.js";
+import { ApiError } from "../errors.js";
+
+export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
+  const { post } = typedRoutes<PublicApiSchema>(app, {
+    onValidationError: (msg) => new ApiError(400, "invalid_request", msg),
+  });
+  const routes = publicApiRoutes.threadFolders;
+
+  post(routes.create, (context, payload) => {
+    const path = normalizeThreadFolderPath(payload.path);
+    if (!path) {
+      throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
+    }
+    return context.json(
+      createThreadFolder(deps.db, deps.hub, {
+        path,
+      }),
+      201,
+    );
+  });
+}
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index fe325c771..9337b8329 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -14,6 +14,7 @@ import { registerEnvironmentRoutes } from "./routes/environments.js";
 import { registerFileRoutes } from "./routes/files.js";
 import { registerHostRoutes } from "./routes/hosts.js";
 import { registerProjectRoutes } from "./routes/projects.js";
+import { registerThreadFolderRoutes } from "./routes/thread-folders.js";
 import { registerAutomationRoutes } from "./routes/automations.js";
 import { registerSystemRoutes } from "./routes/system.js";
 import { registerThreadRoutes } from "./routes/threads/index.js";
@@ -243,6 +244,7 @@ export function createApp(
   });
   const publicApi = new Hono();
   registerProjectRoutes(publicApi, deps);
+  registerThreadFolderRoutes(publicApi, deps);
   registerAutomationRoutes(publicApi, deps);
   registerFileRoutes(publicApi, deps);
   registerHostRoutes(publicApi, deps);
diff --git a/packages/db/drizzle/0043_unique_phantom_reporter.sql b/packages/db/drizzle/0043_unique_phantom_reporter.sql
new file mode 100644
index 000000000..b2e5b93de
--- /dev/null
+++ b/packages/db/drizzle/0043_unique_phantom_reporter.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `thread_folders` (
+	`id` text PRIMARY KEY NOT NULL,
+	`path` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `thread_folders_path_idx` ON `thread_folders` (`path`);--> statement-breakpoint
+CREATE INDEX `thread_folders_updated_idx` ON `thread_folders` (`updated_at`);
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/0043_snapshot.json b/packages/db/drizzle/meta/0043_snapshot.json
new file mode 100644
index 000000000..1e146b331
--- /dev/null
+++ b/packages/db/drizzle/meta/0043_snapshot.json
@@ -0,0 +1,2785 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "e455b374-86f9-4bcf-93dc-d77a46b9fec0",
+  "prevId": "9e7dc789-70c5-49c0-9b06-270a021de7c6",
+  "tables": {
+    "apikey": {
+      "name": "apikey",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "start": {
+          "name": "start",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prefix": {
+          "name": "prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "referenceId": {
+          "name": "referenceId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refillInterval": {
+          "name": "refillInterval",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "refillAmount": {
+          "name": "refillAmount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRefillAt": {
+          "name": "lastRefillAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitEnabled": {
+          "name": "rateLimitEnabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitTimeWindow": {
+          "name": "rateLimitTimeWindow",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitMax": {
+          "name": "rateLimitMax",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "requestCount": {
+          "name": "requestCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remaining": {
+          "name": "remaining",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRequest": {
+          "name": "lastRequest",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiresAt": {
+          "name": "expiresAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configId": {
+          "name": "configId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "apikey_key_unique": {
+          "name": "apikey_key_unique",
+          "columns": [
+            "key"
+          ],
+          "isUnique": true
+        },
+        "apikey_reference_id_idx": {
+          "name": "apikey_reference_id_idx",
+          "columns": [
+            "referenceId"
+          ],
+          "isUnique": false
+        },
+        "apikey_config_id_idx": {
+          "name": "apikey_config_id_idx",
+          "columns": [
+            "configId"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "apikey_referenceId_user_id_fk": {
+          "name": "apikey_referenceId_user_id_fk",
+          "tableFrom": "apikey",
+          "tableTo": "user",
+          "columnsFrom": [
+            "referenceId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automation_runs": {
+      "name": "automation_runs",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "automation_id": {
+          "name": "automation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "skip_reason": {
+          "name": "skip_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "output": {
+          "name": "output",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scheduled_for": {
+          "name": "scheduled_for",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automation_runs_automation_started_idx": {
+          "name": "automation_runs_automation_started_idx",
+          "columns": [
+            "automation_id",
+            "started_at"
+          ],
+          "isUnique": false
+        },
+        "automation_runs_thread_idx": {
+          "name": "automation_runs_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automation_runs_automation_id_automations_id_fk": {
+          "name": "automation_runs_automation_id_automations_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "automations",
+          "columnsFrom": [
+            "automation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automation_runs_thread_id_threads_id_fk": {
+          "name": "automation_runs_thread_id_threads_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automations": {
+      "name": "automations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "target_thread_id": {
+          "name": "target_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger_config": {
+          "name": "trigger_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "execution": {
+          "name": "execution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auto_archive": {
+          "name": "auto_archive",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_by_thread_id": {
+          "name": "created_by_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_run_status": {
+          "name": "last_run_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_thread_id": {
+          "name": "last_run_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automations_project_idx": {
+          "name": "automations_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "automations_due_idx": {
+          "name": "automations_due_idx",
+          "columns": [
+            "enabled",
+            "trigger_type",
+            "next_run_at"
+          ],
+          "isUnique": false
+        },
+        "automations_target_thread_idx": {
+          "name": "automations_target_thread_idx",
+          "columns": [
+            "target_thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automations_project_id_projects_id_fk": {
+          "name": "automations_project_id_projects_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automations_target_thread_id_threads_id_fk": {
+          "name": "automations_target_thread_id_threads_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "target_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "environments": {
+      "name": "environments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "managed": {
+          "name": "managed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_git_repo": {
+          "name": "is_git_repo",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_worktree": {
+          "name": "is_worktree",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_base_branch": {
+          "name": "merge_base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "destroy_attempt_id": {
+          "name": "destroy_attempt_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_provision_type": {
+          "name": "workspace_provision_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'provisioning'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "environments_host_path_idx": {
+          "name": "environments_host_path_idx",
+          "columns": [
+            "host_id",
+            "path"
+          ],
+          "isUnique": true
+        },
+        "environments_project_idx": {
+          "name": "environments_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "environments_status_idx": {
+          "name": "environments_status_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "environments_project_id_projects_id_fk": {
+          "name": "environments_project_id_projects_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environments_host_id_hosts_id_fk": {
+          "name": "environments_host_id_hosts_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "events": {
+      "name": "events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scope_kind": {
+          "name": "scope_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sequence": {
+          "name": "sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_id": {
+          "name": "item_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "data": {
+          "name": "data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "events_thread_sequence_idx": {
+          "name": "events_thread_sequence_idx",
+          "columns": [
+            "thread_id",
+            "sequence"
+          ],
+          "isUnique": true
+        },
+        "events_thread_type_item_kind_sequence_idx": {
+          "name": "events_thread_type_item_kind_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "item_kind",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_type_sequence_idx": {
+          "name": "events_thread_type_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_turn_type_item_sequence_idx": {
+          "name": "events_thread_turn_type_item_sequence_idx",
+          "columns": [
+            "thread_id",
+            "turn_id",
+            "type",
+            "item_id",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_environment_idx": {
+          "name": "events_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "events_completed_item_truncation_idx": {
+          "name": "events_completed_item_truncation_idx",
+          "columns": [
+            "item_kind",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"events\".\"type\" = 'item/completed'"
+        }
+      },
+      "foreignKeys": {
+        "events_thread_id_threads_id_fk": {
+          "name": "events_thread_id_threads_id_fk",
+          "tableFrom": "events",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "events_environment_id_environments_id_fk": {
+          "name": "events_environment_id_environments_id_fk",
+          "tableFrom": "events",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "events_scope_shape_check": {
+          "name": "events_scope_shape_check",
+          "value": "(\n        (\"events\".\"scope_kind\" = 'turn' AND \"events\".\"turn_id\" IS NOT NULL)\n        OR\n        (\"events\".\"scope_kind\" = 'thread' AND \"events\".\"turn_id\" IS NULL)\n      )"
+        }
+      }
+    },
+    "host_daemon_sessions": {
+      "name": "host_daemon_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "instance_id": {
+          "name": "instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_name": {
+          "name": "host_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_type": {
+          "name": "host_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "data_dir": {
+          "name": "data_dir",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "protocol_version": {
+          "name": "protocol_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "heartbeat_interval_ms": {
+          "name": "heartbeat_interval_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_timeout_ms": {
+          "name": "lease_timeout_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "host_daemon_sessions_host_status_idx": {
+          "name": "host_daemon_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_host_latest_idx": {
+          "name": "host_daemon_sessions_host_latest_idx",
+          "columns": [
+            "host_id",
+            "updated_at",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_closed_prune_idx": {
+          "name": "host_daemon_sessions_closed_prune_idx",
+          "columns": [
+            "status",
+            "closed_at",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "host_daemon_sessions_host_id_hosts_id_fk": {
+          "name": "host_daemon_sessions_host_id_hosts_id_fk",
+          "tableFrom": "host_daemon_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "hosts": {
+      "name": "hosts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "destroyed_at": {
+          "name": "destroyed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "hosts_last_seen_idx": {
+          "name": "hosts_last_seen_idx",
+          "columns": [
+            "last_seen_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "maintenance_scan_cursors": {
+      "name": "maintenance_scan_cursors",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "policy": {
+          "name": "policy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "output_path": {
+          "name": "output_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_created_at": {
+          "name": "last_created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_event_id": {
+          "name": "last_event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "maintenance_scan_cursors_path_idx": {
+          "name": "maintenance_scan_cursors_path_idx",
+          "columns": [
+            "policy",
+            "version",
+            "item_kind",
+            "output_path"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "pending_interactions": {
+      "name": "pending_interactions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_request_id": {
+          "name": "provider_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolution": {
+          "name": "resolution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_reason": {
+          "name": "status_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolved_at": {
+          "name": "resolved_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "pending_interactions_provider_request_idx": {
+          "name": "pending_interactions_provider_request_idx",
+          "columns": [
+            "provider_id",
+            "provider_thread_id",
+            "provider_request_id"
+          ],
+          "isUnique": true
+        },
+        "pending_interactions_thread_created_idx": {
+          "name": "pending_interactions_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_thread_status_created_idx": {
+          "name": "pending_interactions_thread_status_created_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_status_created_idx": {
+          "name": "pending_interactions_status_created_idx",
+          "columns": [
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pending_interactions_thread_id_threads_id_fk": {
+          "name": "pending_interactions_thread_id_threads_id_fk",
+          "tableFrom": "pending_interactions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_execution_defaults": {
+      "name": "project_execution_defaults",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_execution_defaults_project_idx": {
+          "name": "project_execution_defaults_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_execution_defaults_project_id_projects_id_fk": {
+          "name": "project_execution_defaults_project_id_projects_id_fk",
+          "tableFrom": "project_execution_defaults",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_sources": {
+      "name": "project_sources",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_sources_project_idx": {
+          "name": "project_sources_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_host_idx": {
+          "name": "project_sources_host_idx",
+          "columns": [
+            "host_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_project_host_idx": {
+          "name": "project_sources_project_host_idx",
+          "columns": [
+            "project_id",
+            "host_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_sources_project_id_projects_id_fk": {
+          "name": "project_sources_project_id_projects_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_sources_host_id_hosts_id_fk": {
+          "name": "project_sources_host_id_hosts_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "project_sources_shape_check": {
+          "name": "project_sources_shape_check",
+          "value": "(\n        \"project_sources\".\"type\" = 'local_path' AND \"project_sources\".\"host_id\" IS NOT NULL AND \"project_sources\".\"path\" IS NOT NULL\n      )"
+        }
+      }
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'standard'"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'V'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "projects_updated_idx": {
+          "name": "projects_updated_idx",
+          "columns": [
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "projects_deleted_idx": {
+          "name": "projects_deleted_idx",
+          "columns": [
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "projects_sort_idx": {
+          "name": "projects_sort_idx",
+          "columns": [
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "projects_personal_singleton_idx": {
+          "name": "projects_personal_singleton_idx",
+          "columns": [
+            "kind"
+          ],
+          "isUnique": true,
+          "where": "\"projects\".\"kind\" = 'personal'"
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "prompt_history_entries": {
+      "name": "prompt_history_entries",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "request_sequence": {
+          "name": "request_sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "input": {
+          "name": "input",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "prompt_history_entries_thread_request_idx": {
+          "name": "prompt_history_entries_thread_request_idx",
+          "columns": [
+            "thread_id",
+            "request_sequence"
+          ],
+          "isUnique": true
+        },
+        "prompt_history_entries_project_scope_created_idx": {
+          "name": "prompt_history_entries_project_scope_created_idx",
+          "columns": [
+            "project_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "prompt_history_entries_thread_scope_created_idx": {
+          "name": "prompt_history_entries_thread_scope_created_idx",
+          "columns": [
+            "thread_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "prompt_history_entries_project_id_projects_id_fk": {
+          "name": "prompt_history_entries_project_id_projects_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "prompt_history_entries_thread_id_threads_id_fk": {
+          "name": "prompt_history_entries_thread_id_threads_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "queued_thread_messages": {
+      "name": "queued_thread_messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender_thread_id": {
+          "name": "sender_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "claim_token": {
+          "name": "claim_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "queued_thread_messages_thread_created_idx": {
+          "name": "queued_thread_messages_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "queued_thread_messages_thread_sort_idx": {
+          "name": "queued_thread_messages_thread_sort_idx",
+          "columns": [
+            "thread_id",
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "queued_thread_messages_thread_id_threads_id_fk": {
+          "name": "queued_thread_messages_thread_id_threads_id_fk",
+          "tableFrom": "queued_thread_messages",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "system_experiments": {
+      "name": "system_experiments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claude_code_mock_cli_traffic": {
+          "name": "claude_code_mock_cli_traffic",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat": {
+          "name": "popout_chat",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat_hotkey": {
+          "name": "popout_chat_hotkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "terminal_sessions": {
+      "name": "terminal_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "daemon_session_id": {
+          "name": "daemon_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "initial_cwd": {
+          "name": "initial_cwd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cols": {
+          "name": "cols",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rows": {
+          "name": "rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_user_input_at": {
+          "name": "last_user_input_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "terminal_sessions_thread_status_updated_idx": {
+          "name": "terminal_sessions_thread_status_updated_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_environment_status_idx": {
+          "name": "terminal_sessions_environment_status_idx",
+          "columns": [
+            "environment_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_host_status_idx": {
+          "name": "terminal_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_daemon_session_idx": {
+          "name": "terminal_sessions_daemon_session_idx",
+          "columns": [
+            "daemon_session_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminal_sessions_thread_id_threads_id_fk": {
+          "name": "terminal_sessions_thread_id_threads_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_environment_id_environments_id_fk": {
+          "name": "terminal_sessions_environment_id_environments_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_host_id_hosts_id_fk": {
+          "name": "terminal_sessions_host_id_hosts_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk": {
+          "name": "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "host_daemon_sessions",
+          "columnsFrom": [
+            "daemon_session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_dynamic_context_file_states": {
+      "name": "thread_dynamic_context_file_states",
+      "columns": {
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_key": {
+          "name": "file_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_status": {
+          "name": "content_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "shown_at": {
+          "name": "shown_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_dynamic_context_file_states_thread_file_idx": {
+          "name": "thread_dynamic_context_file_states_thread_file_idx",
+          "columns": [
+            "thread_id",
+            "file_key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "thread_dynamic_context_file_states_thread_id_threads_id_fk": {
+          "name": "thread_dynamic_context_file_states_thread_id_threads_id_fk",
+          "tableFrom": "thread_dynamic_context_file_states",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_folders": {
+      "name": "thread_folders",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_folders_path_idx": {
+          "name": "thread_folders_path_idx",
+          "columns": [
+            "path"
+          ],
+          "isUnique": true
+        },
+        "thread_folders_updated_idx": {
+          "name": "thread_folders_updated_idx",
+          "columns": [
+            "updated_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_search_segments": {
+      "name": "thread_search_segments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_kind": {
+          "name": "source_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_key": {
+          "name": "source_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_seq": {
+          "name": "source_seq",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_search_segments_source_idx": {
+          "name": "thread_search_segments_source_idx",
+          "columns": [
+            "thread_id",
+            "source_kind",
+            "source_key"
+          ],
+          "isUnique": true
+        },
+        "thread_search_segments_thread_idx": {
+          "name": "thread_search_segments_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "thread_search_segments_thread_id_threads_id_fk": {
+          "name": "thread_search_segments_thread_id_threads_id_fk",
+          "tableFrom": "thread_search_segments",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "threads": {
+      "name": "threads",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model_override": {
+          "name": "model_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "reasoning_level_override": {
+          "name": "reasoning_level_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title_fallback": {
+          "name": "title_fallback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "folder_path": {
+          "name": "folder_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'starting'"
+        },
+        "parent_thread_id": {
+          "name": "parent_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "source_thread_id": {
+          "name": "source_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "origin_kind": {
+          "name": "origin_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "child_origin": {
+          "name": "child_origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pinned_at": {
+          "name": "pinned_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pin_sort_key": {
+          "name": "pin_sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_read_at": {
+          "name": "last_read_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "latest_attention_at": {
+          "name": "latest_attention_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "threads_project_updated_idx": {
+          "name": "threads_project_updated_idx",
+          "columns": [
+            "project_id",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "threads_project_archived_deleted_idx": {
+          "name": "threads_project_archived_deleted_idx",
+          "columns": [
+            "project_id",
+            "archived_at",
+            "deleted_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "threads_pin_sort_idx": {
+          "name": "threads_pin_sort_idx",
+          "columns": [
+            "archived_at",
+            "deleted_at",
+            "pin_sort_key",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"pinned_at\" IS NOT NULL"
+        },
+        "threads_environment_idx": {
+          "name": "threads_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "threads_parent_idx": {
+          "name": "threads_parent_idx",
+          "columns": [
+            "parent_thread_id"
+          ],
+          "isUnique": false
+        },
+        "threads_source_origin_idx": {
+          "name": "threads_source_origin_idx",
+          "columns": [
+            "source_thread_id",
+            "origin_kind"
+          ],
+          "isUnique": false
+        },
+        "threads_archived_status_idx": {
+          "name": "threads_archived_status_idx",
+          "columns": [
+            "archived_at",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "threads_environment_archived_deleted_idx": {
+          "name": "threads_environment_archived_deleted_idx",
+          "columns": [
+            "environment_id",
+            "archived_at",
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "threads_active_maintenance_idx": {
+          "name": "threads_active_maintenance_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"deleted_at\" IS NULL"
+        }
+      },
+      "foreignKeys": {
+        "threads_project_id_projects_id_fk": {
+          "name": "threads_project_id_projects_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "threads_environment_id_environments_id_fk": {
+          "name": "threads_environment_id_environments_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_parent_thread_id_threads_id_fk": {
+          "name": "threads_parent_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "parent_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_source_thread_id_threads_id_fk": {
+          "name": "threads_source_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "source_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index ad598da05..d007f1d99 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -302,6 +302,13 @@
       "when": 1781849421982,
       "tag": "0042_thread_folder_path",
       "breakpoints": true
+    },
+    {
+      "idx": 43,
+      "version": "6",
+      "when": 1781851451425,
+      "tag": "0043_unique_phantom_reporter",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/data/index.ts b/packages/db/src/data/index.ts
index 59c688566..98e680db0 100644
--- a/packages/db/src/data/index.ts
+++ b/packages/db/src/data/index.ts
@@ -19,6 +19,18 @@ export type {
   UpdateProjectInput,
 } from "./projects.js";
 
+export {
+  createThreadFolder,
+  ensureThreadFolderPath,
+  getThreadFolderByPath,
+  listThreadFolders,
+  normalizeThreadFolderPath,
+} from "./thread-folders.js";
+export type {
+  CreateThreadFolderInput,
+  ThreadFolderRow,
+} from "./thread-folders.js";
+
 export {
   createAutomation,
   getAutomation,
diff --git a/packages/db/src/data/thread-folders.ts b/packages/db/src/data/thread-folders.ts
new file mode 100644
index 000000000..f7ff4f5fa
--- /dev/null
+++ b/packages/db/src/data/thread-folders.ts
@@ -0,0 +1,118 @@
+import { asc, eq } from "drizzle-orm";
+import { PERSONAL_PROJECT_ID } from "@bb/domain";
+import type {
+  DbConnection,
+  DbQueryConnection,
+  DbTransaction,
+} from "../connection.js";
+import { createThreadFolderId } from "../ids.js";
+import type { DbNotifier } from "../notifier.js";
+import { threadFolders } from "../schema.js";
+
+type ThreadFolderWriteConnection = DbConnection | DbTransaction;
+
+export type ThreadFolderRow = typeof threadFolders.$inferSelect;
+
+export interface CreateThreadFolderInput {
+  path: string;
+}
+
+function splitFolderSegments(path: string): string[] {
+  return path
+    .split("/")
+    .map((segment) => segment.trim())
+    .filter((segment) => segment.length > 0);
+}
+
+export function normalizeThreadFolderPath(
+  path: string | null | undefined,
+): string | null {
+  const normalized = splitFolderSegments(path ?? "").join("/");
+  return normalized.length > 0 ? normalized : null;
+}
+
+function folderAncestors(path: string): string[] {
+  const segments = splitFolderSegments(path);
+  const ancestors: string[] = [];
+  for (let depth = 1; depth <= segments.length; depth += 1) {
+    ancestors.push(segments.slice(0, depth).join("/"));
+  }
+  return ancestors;
+}
+
+export function getThreadFolderByPath(
+  db: DbQueryConnection,
+  path: string,
+): ThreadFolderRow | null {
+  const normalized = normalizeThreadFolderPath(path);
+  if (!normalized) {
+    return null;
+  }
+  return (
+    db
+      .select()
+      .from(threadFolders)
+      .where(eq(threadFolders.path, normalized))
+      .get() ?? null
+  );
+}
+
+export function listThreadFolders(db: DbQueryConnection): ThreadFolderRow[] {
+  return db
+    .select()
+    .from(threadFolders)
+    .orderBy(asc(threadFolders.path), asc(threadFolders.id))
+    .all();
+}
+
+export function ensureThreadFolderPath(
+  db: ThreadFolderWriteConnection,
+  notifier: DbNotifier,
+  path: string | null | undefined,
+): ThreadFolderRow | null {
+  const normalized = normalizeThreadFolderPath(path);
+  if (!normalized) {
+    return null;
+  }
+
+  const now = Date.now();
+  let createdAny = false;
+  let deepest: ThreadFolderRow | null = null;
+  for (const ancestorPath of folderAncestors(normalized)) {
+    const inserted =
+      db
+        .insert(threadFolders)
+        .values({
+          id: createThreadFolderId(),
+          path: ancestorPath,
+          createdAt: now,
+          updatedAt: now,
+        })
+        .onConflictDoNothing()
+        .returning()
+        .get() ?? null;
+    if (inserted) {
+      createdAny = true;
+      deepest = inserted;
+      continue;
+    }
+    deepest = getThreadFolderByPath(db, ancestorPath);
+  }
+
+  if (createdAny) {
+    notifier.notifyProject(PERSONAL_PROJECT_ID, ["threads-changed"]);
+  }
+  return deepest;
+}
+
+export function createThreadFolder(
+  db: DbConnection,
+  notifier: DbNotifier,
+  input: CreateThreadFolderInput,
+): ThreadFolderRow {
+  const folder = ensureThreadFolderPath(db, notifier, input.path);
+  if (!folder) {
+    throw new Error("Thread folder path cannot be empty");
+  }
+  return folder;
+}
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index 987381560..c1e3df023 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -42,6 +42,7 @@ import { createThreadId } from "../ids.js";
 import {
   createOrderKeyBetween,
 } from "./order-keys.js";
+import { ensureThreadFolderPath } from "./thread-folders.js";
 
 type ThreadWriteConnection = DbConnection | DbTransaction;
 
@@ -287,6 +288,7 @@ export function createThread(
         })
         .returning()
         .get();
+      ensureThreadFolderPath(tx, notifier, createdThread.folderPath);
       upsertThreadTitleSearchSegments(tx, {
         threadId: createdThread.id,
         title: createdThread.title,
@@ -1545,7 +1547,10 @@ export function updateThread(
 
   const set: Partial<typeof threads.$inferInsert> = { updatedAt: now };
   if ("title" in input) set.title = input.title;
-  if ("folderPath" in input) set.folderPath = input.folderPath;
+  if ("folderPath" in input) {
+    ensureThreadFolderPath(db, notifier, input.folderPath);
+    set.folderPath = input.folderPath;
+  }
   if ("environmentId" in input) set.environmentId = input.environmentId;
   if ("lastReadAt" in input) {
     set.lastReadAt = input.lastReadAt;
diff --git a/packages/db/src/ids.ts b/packages/db/src/ids.ts
index be05f926c..94a1a5483 100644
--- a/packages/db/src/ids.ts
+++ b/packages/db/src/ids.ts
@@ -36,6 +36,10 @@ export function createThreadId(): string {
   return createId("thr");
 }
 
+export function createThreadFolderId(): string {
+  return createId("fld");
+}
+
 export function createAutomationId(): string {
   return createId("auto");
 }
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index 75f685c79..db3b76fc7 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -307,6 +307,20 @@ export const threads = sqliteTable(
   ],
 );
 
+export const threadFolders = sqliteTable(
+  "thread_folders",
+  {
+    id: text("id").primaryKey(),
+    path: text("path").notNull(),
+    createdAt: integer("created_at").notNull(),
+    updatedAt: integer("updated_at").notNull(),
+  },
+  (table) => [
+    uniqueIndex("thread_folders_path_idx").on(table.path),
+    index("thread_folders_updated_idx").on(table.updatedAt),
+  ],
+);
+
 export const threadSearchSegments = sqliteTable(
   "thread_search_segments",
   {
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 6a9ce2cce..2d3addfda 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -28,6 +28,10 @@ import {
   applyThreadLifecycleEvent,
   requireThreadLifecycleEventApplied,
 } from "../../src/data/threads.js";
+import {
+  createThreadFolder,
+  listThreadFolders,
+} from "../../src/data/thread-folders.js";
 import { createProject } from "../../src/data/projects.js";
 import { upsertHost } from "../../src/data/hosts.js";
 import { createEnvironment } from "../../src/data/environments.js";
@@ -619,6 +623,10 @@ describe("threads", () => {
     });
 
     expect(updated?.folderPath).toBe("Work/Q3");
+    expect(listThreadFolders(db).map((folder) => folder.path)).toEqual([
+      "Work",
+      "Work/Q3",
+    ]);
     expect(spy.notifyThread).toHaveBeenCalledWith(
       thread.id,
       ["title-changed"],
@@ -626,6 +634,20 @@ describe("threads", () => {
     );
   });
 
+  it("creates explicit thread folders with ancestors", () => {
+    const { db } = setup();
+
+    const folder = createThreadFolder(db, noopNotifier, {
+      path: " Work / Q3 ",
+    });
+
+    expect(folder.path).toBe("Work/Q3");
+    expect(listThreadFolders(db).map((entry) => entry.path)).toEqual([
+      "Work",
+      "Work/Q3",
+    ]);
+  });
+
   it("notifies when a thread parent changes", () => {
     const { db, project } = setup();
     const spy: DbNotifier = {
diff --git a/packages/server-contract/src/api/projects.ts b/packages/server-contract/src/api/projects.ts
index a11baa117..85ed98c35 100644
--- a/packages/server-contract/src/api/projects.ts
+++ b/packages/server-contract/src/api/projects.ts
@@ -54,6 +54,25 @@ export const createProjectRequestSchema = z.object({
 });
 export type CreateProjectRequest = z.infer<typeof createProjectRequestSchema>;
 
+export const threadFolderSchema = z
+  .object({
+    id: z.string(),
+    path: z.string().min(1),
+    createdAt: z.number(),
+    updatedAt: z.number(),
+  })
+  .strict();
+export type ThreadFolderResponse = z.infer<typeof threadFolderSchema>;
+
+export const createThreadFolderRequestSchema = z
+  .object({
+    path: z.string().min(1),
+  })
+  .strict();
+export type CreateThreadFolderRequest = z.infer<
+  typeof createThreadFolderRequestSchema
+>;
+
 export const reorderProjectRequestSchema = z.object({
   previousProjectId: z.string().min(1).nullable(),
   nextProjectId: z.string().min(1).nullable(),
@@ -273,6 +292,7 @@ export type ProjectWithThreadsResponse = z.infer<
 >;
 
 export const sidebarBootstrapResponseSchema = z.object({
+  folders: z.array(threadFolderSchema),
   projects: z.array(projectWithThreadsResponseSchema),
   personalProject: projectWithThreadsResponseSchema,
 });
diff --git a/packages/server-contract/src/public-api.ts b/packages/server-contract/src/public-api.ts
index 74129784d..073e96b3e 100644
--- a/packages/server-contract/src/public-api.ts
+++ b/packages/server-contract/src/public-api.ts
@@ -46,6 +46,7 @@ import type {
   CreateProjectRequest,
   CreateProjectSourceRequest,
   CreateQueuedMessageRequest,
+  CreateThreadFolderRequest,
   CreateThreadRequest,
   CreateThreadTerminalRequest,
   DeleteThreadRequest,
@@ -101,6 +102,7 @@ import type {
   ThreadComposerBootstrapResponse,
   ThreadEventWaitQuery,
   ThreadEventsQuery,
+  ThreadFolderResponse,
   ThreadFilesRawQuery,
   ThreadGetQuery,
   ThreadHostFileContentQuery,
@@ -137,6 +139,7 @@ import {
   runAutomationRequestSchema,
   updateAutomationRequestSchema,
   closeThreadTerminalRequestSchema,
+  createThreadFolderRequestSchema,
   createProjectRequestSchema,
   createProjectSourceRequestSchema,
   createQueuedMessageRequestSchema,
@@ -449,6 +452,17 @@ export const publicApiRoutes = {
     }),
   },
 
+  threadFolders: {
+    create: defineRoute({
+      path: "/thread-folders",
+      method: "post",
+      request: jsonRequest<EmptyInput, CreateThreadFolderRequest>(
+        createThreadFolderRequestSchema,
+      ),
+      response: jsonResponse<ThreadFolderResponse>({ status: 201 }),
+    }),
+  },
+
   threads: {
     list: defineRoute({
       path: "/threads",

From 71ea5dbc63881a8321fa7c51821d8e23a62c8314 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:16:55 -0700
Subject: [PATCH 14/54] Add project-scoped thread folders

---
 .../src/components/sidebar/ProjectList.tsx    |  110 +-
 .../sidebar/ProjectListProjects.tsx           |   16 +-
 .../app/src/components/sidebar/ProjectRow.tsx |   28 +
 .../components/sidebar/SidebarFolderRow.tsx   |   12 +-
 .../sidebar/projectThreadGroups.test.ts       |   36 +-
 .../src/components/sidebar/sortableMotion.ts  |   12 +-
 apps/app/src/components/ui/icon.tsx           |    2 +
 apps/server/src/routes/thread-folders.ts      |    6 +
 packages/db/drizzle/0044_solid_mysterio.sql   |    5 +
 packages/db/drizzle/meta/0044_snapshot.json   | 2823 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    7 +
 packages/db/src/data/thread-folders.ts        |   32 +-
 packages/db/src/data/threads.ts               |    9 +-
 packages/db/src/schema.ts                     |   11 +-
 packages/db/test/data/threads.test.ts         |   47 +-
 packages/server-contract/src/api/projects.ts  |    2 +
 16 files changed, 3108 insertions(+), 50 deletions(-)
 create mode 100644 packages/db/drizzle/0044_solid_mysterio.sql
 create mode 100644 packages/db/drizzle/meta/0044_snapshot.json

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 674e77463..113e72bfd 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -17,7 +17,10 @@ import {
   SortableContext,
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
-import type { ProjectResponse } from "@bb/server-contract";
+import type {
+  ProjectResponse,
+  ThreadFolderResponse,
+} from "@bb/server-contract";
 import {
   findLocalPathProjectSourceForHost,
   PERSONAL_PROJECT_ID,
@@ -173,7 +176,7 @@ interface ProjectListProjectsSectionActionsProps {
 
 interface ProjectListThreadsSectionActionsProps {
   isCreatingFolder: boolean;
-  onNewFolder: () => void;
+  onNewFolder?: () => void;
   onNewThread: () => void;
 }
 
@@ -339,7 +342,7 @@ const EMPTY_PROJECT_THREAD_LIST_STATE: ProjectThreadListState = {
 };
 
 const EMPTY_PROJECTS: readonly ProjectResponse[] = [];
-const EMPTY_FOLDER_PATHS: readonly string[] = [];
+const EMPTY_FOLDER_DEFINITIONS: readonly ThreadFolderResponse[] = [];
 
 function getProjectId(project: ProjectResponse): string {
   return project.id;
@@ -392,6 +395,39 @@ function normalizeCollapsedSidebarSectionIds(
   return normalized;
 }
 
+function uniqueFolderPaths(
+  folders: readonly ThreadFolderResponse[],
+): readonly string[] {
+  const paths = new Set<string>();
+  for (const folder of folders) {
+    paths.add(folder.path);
+  }
+  return Array.from(paths).sort((left, right) => left.localeCompare(right));
+}
+
+function groupFolderPathsByProjectId(
+  folders: readonly ThreadFolderResponse[],
+): ReadonlyMap<string, readonly string[]> {
+  const pathsByProjectId = new Map<string, string[]>();
+  for (const folder of folders) {
+    if (folder.projectId === null) {
+      continue;
+    }
+    const paths = pathsByProjectId.get(folder.projectId);
+    if (paths) {
+      paths.push(folder.path);
+    } else {
+      pathsByProjectId.set(folder.projectId, [folder.path]);
+    }
+  }
+
+  for (const paths of pathsByProjectId.values()) {
+    paths.sort((left, right) => left.localeCompare(right));
+  }
+
+  return pathsByProjectId;
+}
+
 function ProjectListSectionIconButton({
   ariaLabel,
   disabled = false,
@@ -445,13 +481,15 @@ function ProjectListThreadsSectionActions({
 }: ProjectListThreadsSectionActionsProps) {
   return (
     <>
-      <ProjectListSectionIconButton
-        ariaLabel="New folder"
-        title="New folder"
-        disabled={isCreatingFolder}
-        iconName="FolderPlus"
-        onClick={onNewFolder}
-      />
+      {onNewFolder ? (
+        <ProjectListSectionIconButton
+          ariaLabel="New folder"
+          title="New folder"
+          disabled={isCreatingFolder}
+          iconName="FolderPlus"
+          onClick={onNewFolder}
+        />
+      ) : null}
       <ProjectListSectionIconButton
         ariaLabel="New thread"
         title="New thread"
@@ -973,11 +1011,14 @@ function ProjectListComponent({
   const setRootComposeProjectId = useSetRootComposeProjectId();
   const sidebarNavigationQuery = useSidebarNavigation();
   const sidebarNavigation = sidebarNavigationQuery.data;
-  const folderPaths = useMemo(
-    () =>
-      sidebarNavigation?.folders.map((folder) => folder.path) ??
-      EMPTY_FOLDER_PATHS,
-    [sidebarNavigation],
+  const folders = sidebarNavigation?.folders ?? EMPTY_FOLDER_DEFINITIONS;
+  const folderPathsByProjectId = useMemo(
+    () => groupFolderPathsByProjectId(folders),
+    [folders],
+  );
+  const chronologicalFolderPaths = useMemo(
+    () => uniqueFolderPaths(folders),
+    [folders],
   );
   const projects = useMemo(
     () => sidebarNavigation?.projects.map(stripProjectThreads),
@@ -1131,24 +1172,34 @@ function ProjectListComponent({
   const handleCreateProjectlessThread = useCallback(() => {
     openRootComposeForProject(PERSONAL_PROJECT_ID);
   }, [openRootComposeForProject]);
-  const [isFolderCreateDialogOpen, setIsFolderCreateDialogOpen] =
-    useState(false);
-  const handleOpenCreateFolderDialog = useCallback(() => {
-    setIsFolderCreateDialogOpen(true);
+  const [folderCreateProjectId, setFolderCreateProjectId] = useState<
+    string | null
+  >(null);
+  const isFolderCreateDialogOpen = folderCreateProjectId !== null;
+  const handleOpenCreateProjectFolderDialog = useCallback(
+    (projectId: string) => {
+      setFolderCreateProjectId(projectId);
+    },
+    [],
+  );
+  const handleOpenCreateProjectlessFolderDialog = useCallback(() => {
+    setFolderCreateProjectId(PERSONAL_PROJECT_ID);
   }, []);
   const handleCreateFolderDialogOpenChange = useCallback((open: boolean) => {
-    setIsFolderCreateDialogOpen(open);
+    if (!open) {
+      setFolderCreateProjectId(null);
+    }
   }, []);
   const handleCreateThreadFolder = useCallback(
     (path: string) => {
       createThreadFolderMutate(
-        { path },
+        { path, projectId: folderCreateProjectId },
         {
-          onSuccess: () => setIsFolderCreateDialogOpen(false),
+          onSuccess: () => setFolderCreateProjectId(null),
         },
       );
     },
-    [createThreadFolderMutate],
+    [createThreadFolderMutate, folderCreateProjectId],
   );
   const handleOpenProjectlessArchivedThreads = useCallback(() => {
     onProjectSelect?.();
@@ -1574,7 +1625,8 @@ function ProjectListComponent({
       compareThreads={sidebarThreadComparator}
       onProjectSelect={onProjectSelect}
       onCreateProjectThread={handleCreateProjectThread}
-      folderPaths={folderPaths}
+      onCreateProjectFolder={handleOpenCreateProjectFolderDialog}
+      folderPathsByProjectId={folderPathsByProjectId}
       onToggleProjectCollapsed={toggleProjectCollapsed}
       onToggleThreadCollapsed={toggleThreadCollapsed}
       onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
@@ -1589,7 +1641,7 @@ function ProjectListComponent({
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
       compareThreads={sidebarThreadComparator}
-      folderPaths={folderPaths}
+      folderPaths={folderPathsByProjectId.get(PERSONAL_PROJECT_ID)}
       variant="section"
       onProjectSelect={onProjectSelect}
       onToggleThreadCollapsed={toggleThreadCollapsed}
@@ -1600,7 +1652,7 @@ function ProjectListComponent({
     <ChronologicalThreadTree
       threadListState={allThreadsListState}
       compareThreads={sidebarThreadComparator}
-      folderPaths={folderPaths}
+      folderPaths={chronologicalFolderPaths}
       selectedThreadId={selectedThreadId}
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
@@ -1641,7 +1693,11 @@ function ProjectListComponent({
       />
       <ProjectListThreadsSectionActions
         isCreatingFolder={isCreateThreadFolderPending}
-        onNewFolder={handleOpenCreateFolderDialog}
+        onNewFolder={
+          organizationMode === "chronological"
+            ? undefined
+            : handleOpenCreateProjectlessFolderDialog
+        }
         onNewThread={handleCreateProjectlessThread}
       />
     </>
diff --git a/apps/app/src/components/sidebar/ProjectListProjects.tsx b/apps/app/src/components/sidebar/ProjectListProjects.tsx
index 3c0f6f8d6..ad94d3ba0 100644
--- a/apps/app/src/components/sidebar/ProjectListProjects.tsx
+++ b/apps/app/src/components/sidebar/ProjectListProjects.tsx
@@ -51,9 +51,10 @@ export interface ProjectListProjectsProps {
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
   compareThreads: ThreadComparator;
-  folderPaths?: readonly string[];
+  folderPathsByProjectId?: ReadonlyMap<string, readonly string[]>;
   onProjectSelect?: () => void;
   onCreateProjectThread?: (projectId: string) => void;
+  onCreateProjectFolder?: (projectId: string) => void;
   onToggleProjectCollapsed: (projectId: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
@@ -64,6 +65,8 @@ interface SortableProjectRowProps extends ProjectRowProps {
   reorderDisabled: boolean;
 }
 
+const EMPTY_FOLDER_PATHS: readonly string[] = [];
+
 const SortableProjectRow = memo(function SortableProjectRow({
   project,
   reorderDisabled,
@@ -100,9 +103,10 @@ export function ProjectListProjects({
   collapsedThreadIds,
   collapsedEnvironmentIds,
   compareThreads,
-  folderPaths,
+  folderPathsByProjectId,
   onProjectSelect,
   onCreateProjectThread,
+  onCreateProjectFolder,
   onToggleProjectCollapsed,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
@@ -111,7 +115,8 @@ export function ProjectListProjects({
   const sharedRowProps = (row: ProjectListRowModel) => ({
     project: row.project,
     threadListState: row.threadListState,
-    folderPaths,
+    folderPaths:
+      folderPathsByProjectId?.get(row.project.id) ?? EMPTY_FOLDER_PATHS,
     selectedThreadId,
     isActive: row.isActive,
     isCollapsed: collapsedProjectIds.has(row.project.id),
@@ -121,6 +126,7 @@ export function ProjectListProjects({
     isLocalPathInvalid: row.isLocalPathInvalid,
     onProjectSelect,
     onCreateProjectThread,
+    onCreateProjectFolder,
     onToggleProjectCollapsed,
     onToggleThreadCollapsed,
     onToggleEnvironmentCollapsed,
@@ -157,9 +163,7 @@ export function ProjectListProjects({
         <SidebarMenuItem>
           <EmptyState
             message={
-              status === "unavailable"
-                ? "Projects unavailable"
-                : "No projects"
+              status === "unavailable" ? "Projects unavailable" : "No projects"
             }
             icon="Folder"
             className="px-2 py-1.5"
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 0924ef60f..9062843fc 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -136,6 +136,7 @@ export interface ProjectRowProps {
   isLocalPathInvalid: boolean;
   onProjectSelect?: () => void;
   onCreateProjectThread?: (projectId: string) => void;
+  onCreateProjectFolder?: (projectId: string) => void;
   onToggleProjectCollapsed: (projectId: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
@@ -1287,6 +1288,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
         activity={folder.activity}
         consumeClickSuppression={consumeClickSuppression}
         dragBindings={dragBindings}
+        isDropTargetActive={dragBindings?.isOver === true}
         isCollapsed={isCollapsed}
         onToggleCollapsed={handleToggleCollapsed}
         stickyLevel={stickyLevel}
@@ -1657,6 +1659,7 @@ function ProjectRowComponent({
   isLocalPathInvalid,
   onProjectSelect,
   onCreateProjectThread,
+  onCreateProjectFolder,
   onToggleProjectCollapsed,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
@@ -1685,6 +1688,9 @@ function ProjectRowComponent({
   const handleCreateThread = useCallback(() => {
     onCreateProjectThread?.(project.id);
   }, [onCreateProjectThread, project.id]);
+  const handleCreateFolder = useCallback(() => {
+    onCreateProjectFolder?.(project.id);
+  }, [onCreateProjectFolder, project.id]);
   return (
     <SidebarStickyGroup asChild data-sidebar-sticky-project-item="">
       <SidebarMenuItem
@@ -1786,6 +1792,27 @@ function ProjectRowComponent({
                   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
                 )}
               />
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon"
+                aria-label={`New folder in ${project.name}`}
+                title="New folder"
+                disabled={!onCreateProjectFolder}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  handleCreateFolder();
+                }}
+                className={cn(
+                  "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                )}
+              >
+                <Icon
+                  name="FolderPlus"
+                  className={COARSE_POINTER_ICON_SIZE_CLASS}
+                />
+              </Button>
               <Button
                 type="button"
                 variant="ghost"
@@ -1916,6 +1943,7 @@ function areProjectRowPropsEqual(
     prev.isLocalPathInvalid !== next.isLocalPathInvalid ||
     prev.onProjectSelect !== next.onProjectSelect ||
     prev.onCreateProjectThread !== next.onCreateProjectThread ||
+    prev.onCreateProjectFolder !== next.onCreateProjectFolder ||
     prev.onToggleProjectCollapsed !== next.onToggleProjectCollapsed ||
     prev.onToggleThreadCollapsed !== next.onToggleThreadCollapsed ||
     prev.onToggleEnvironmentCollapsed !== next.onToggleEnvironmentCollapsed ||
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index 98ffdb9f5..a15189e86 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -43,6 +43,7 @@ interface SidebarFolderRowProps {
   stickyLevel?: number;
   consumeClickSuppression?: ConsumeDragClickSuppression;
   dragBindings?: SidebarSortableDragBindings;
+  isDropTargetActive?: boolean;
 }
 
 // The "Work › Q3" disclosure header for a folder. Not a thread: clicking
@@ -55,6 +56,7 @@ function SidebarFolderRowComponent({
   activity,
   consumeClickSuppression,
   dragBindings,
+  isDropTargetActive = false,
   isCollapsed,
   onToggleCollapsed,
   stickyLevel,
@@ -73,6 +75,8 @@ function SidebarFolderRowComponent({
     COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
     "cursor-pointer",
     dragBindings && !dragBindings.disabled && "select-none",
+    isDropTargetActive &&
+      "bg-sidebar-accent text-sidebar-accent-foreground ring-1 ring-sidebar-ring",
   );
   const style: CSSProperties = {
     paddingLeft: getSidebarThreadRowPaddingLeft(depth),
@@ -106,7 +110,7 @@ function SidebarFolderRowComponent({
         aria-hidden="true"
       >
         <Icon
-          name={isCollapsed ? "Folder" : "FolderOpen"}
+          name="FolderTree"
           className={COARSE_POINTER_ICON_SIZE_CLASS}
           aria-hidden="true"
         />
@@ -128,7 +132,11 @@ function SidebarFolderRowComponent({
           COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
         )}
       >
-        {showRollupGlyph ? (
+        {isDropTargetActive ? (
+          <span className="pointer-events-none absolute inset-0 flex items-center justify-end pr-1 text-xs font-medium text-sidebar-accent-foreground">
+            Drop inside
+          </span>
+        ) : showRollupGlyph ? (
           <span
             className={cn(
               SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.test.ts b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
index 8108ec228..20ccd6bff 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.test.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.test.ts
@@ -576,7 +576,10 @@ describe("folder bucketing", () => {
     );
 
     expect(summarizeItems(items)).toEqual([
-      { folder: "proj_1::Work", items: [{ folder: "proj_1::Work/Q3", items: [] }] },
+      {
+        folder: "proj_1::Work",
+        items: [{ folder: "proj_1::Work/Q3", items: [] }],
+      },
       "a",
     ]);
   });
@@ -736,6 +739,37 @@ describe("folder bucketing", () => {
     ]);
   });
 
+  it("combines same-named folders across projects in the chronological list", () => {
+    const items = buildChronologicalThreadList(
+      [
+        createThread({
+          id: "a",
+          projectId: "proj_1",
+          title: "One",
+          folderPath: "Work",
+          createdAt: 20,
+        }),
+        createThread({
+          id: "b",
+          projectId: "proj_2",
+          title: "Two",
+          folderPath: "Work",
+          createdAt: 10,
+        }),
+      ],
+      compareByCreatedAtDescending,
+      {
+        groupBy: "folder",
+        containerId: "chronological",
+        folderPaths: ["Work", "Work"],
+      },
+    );
+
+    expect(summarizeItems(items)).toEqual([
+      { folder: "chronological::Work", items: ["a", "b"] },
+    ]);
+  });
+
   describe("regression: Group by: None is unchanged", () => {
     const slashFixture = [
       createThread({ id: "a", title: "Work/Q3/Plan", createdAt: 30 }),
diff --git a/apps/app/src/components/sidebar/sortableMotion.ts b/apps/app/src/components/sidebar/sortableMotion.ts
index 5b2e9a739..e1fbca873 100644
--- a/apps/app/src/components/sidebar/sortableMotion.ts
+++ b/apps/app/src/components/sidebar/sortableMotion.ts
@@ -19,6 +19,7 @@ const SIDEBAR_SORTABLE_TRANSITION = {
 export interface SidebarSortableDragBindings {
   attributes: DraggableAttributes;
   disabled: boolean;
+  isOver: boolean;
   listeners: DraggableSyntheticListeners;
   setActivatorNodeRef: (element: HTMLDivElement | null) => void;
 }
@@ -46,6 +47,7 @@ export function useSidebarSortable({
   const {
     attributes,
     isDragging,
+    isOver,
     listeners,
     setActivatorNodeRef,
     setNodeRef,
@@ -68,8 +70,14 @@ export function useSidebarSortable({
     [isDragging, transform, transition],
   );
   const dragBindings = useMemo<SidebarSortableDragBindings>(
-    () => ({ attributes, disabled, listeners, setActivatorNodeRef }),
-    [attributes, disabled, listeners, setActivatorNodeRef],
+    () => ({
+      attributes,
+      disabled,
+      isOver,
+      listeners,
+      setActivatorNodeRef,
+    }),
+    [attributes, disabled, isOver, listeners, setActivatorNodeRef],
   );
 
   return { dragBindings, setNodeRef, style };
diff --git a/apps/app/src/components/ui/icon.tsx b/apps/app/src/components/ui/icon.tsx
index 14ecfa0e7..9bd2b14af 100644
--- a/apps/app/src/components/ui/icon.tsx
+++ b/apps/app/src/components/ui/icon.tsx
@@ -51,6 +51,7 @@ import {
   FolderGitTwoIcon,
   FolderIcon,
   FolderRemoveIcon,
+  FolderTreeIcon,
   GitBranchIcon,
   GitMergeIcon,
   GitPullRequestArrow,
@@ -148,6 +149,7 @@ const ICON_MAP = {
   FolderOpen: Folder02Icon,
   FolderMinus: FolderRemoveIcon,
   FolderPlus: FolderAddIcon,
+  FolderTree: FolderTreeIcon,
   Fork: TrendingUpDownIcon,
   GitBranch: GitBranchIcon,
   GitMerge: GitMergeIcon,
diff --git a/apps/server/src/routes/thread-folders.ts b/apps/server/src/routes/thread-folders.ts
index 7d730a63d..fa5a17e65 100644
--- a/apps/server/src/routes/thread-folders.ts
+++ b/apps/server/src/routes/thread-folders.ts
@@ -7,6 +7,7 @@ import {
 import type { Hono } from "hono";
 import type { AppDeps } from "../types.js";
 import { ApiError } from "../errors.js";
+import { requirePublicProject } from "../services/lib/entity-lookup.js";
 
 export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
   const { post } = typedRoutes<PublicApiSchema>(app, {
@@ -19,9 +20,14 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
+    const projectId = payload.projectId ?? null;
+    if (projectId !== null) {
+      requirePublicProject(deps.db, projectId);
+    }
     return context.json(
       createThreadFolder(deps.db, deps.hub, {
         path,
+        projectId,
       }),
       201,
     );
diff --git a/packages/db/drizzle/0044_solid_mysterio.sql b/packages/db/drizzle/0044_solid_mysterio.sql
new file mode 100644
index 000000000..29b8342b8
--- /dev/null
+++ b/packages/db/drizzle/0044_solid_mysterio.sql
@@ -0,0 +1,5 @@
+DROP INDEX `thread_folders_path_idx`;--> statement-breakpoint
+ALTER TABLE `thread_folders` ADD `project_id` text REFERENCES projects(id) ON DELETE cascade;--> statement-breakpoint
+CREATE UNIQUE INDEX `thread_folders_global_path_idx` ON `thread_folders` (`path`) WHERE "thread_folders"."project_id" IS NULL;--> statement-breakpoint
+CREATE UNIQUE INDEX `thread_folders_project_path_idx` ON `thread_folders` (`project_id`,`path`) WHERE "thread_folders"."project_id" IS NOT NULL;--> statement-breakpoint
+CREATE INDEX `thread_folders_project_idx` ON `thread_folders` (`project_id`);
diff --git a/packages/db/drizzle/meta/0044_snapshot.json b/packages/db/drizzle/meta/0044_snapshot.json
new file mode 100644
index 000000000..7378e9bb6
--- /dev/null
+++ b/packages/db/drizzle/meta/0044_snapshot.json
@@ -0,0 +1,2823 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "16d6dffb-2400-4fb6-b6c7-a17c9e224a9a",
+  "prevId": "e455b374-86f9-4bcf-93dc-d77a46b9fec0",
+  "tables": {
+    "apikey": {
+      "name": "apikey",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "start": {
+          "name": "start",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prefix": {
+          "name": "prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "referenceId": {
+          "name": "referenceId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refillInterval": {
+          "name": "refillInterval",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "refillAmount": {
+          "name": "refillAmount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRefillAt": {
+          "name": "lastRefillAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitEnabled": {
+          "name": "rateLimitEnabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitTimeWindow": {
+          "name": "rateLimitTimeWindow",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rateLimitMax": {
+          "name": "rateLimitMax",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "requestCount": {
+          "name": "requestCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remaining": {
+          "name": "remaining",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lastRequest": {
+          "name": "lastRequest",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiresAt": {
+          "name": "expiresAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configId": {
+          "name": "configId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "apikey_key_unique": {
+          "name": "apikey_key_unique",
+          "columns": [
+            "key"
+          ],
+          "isUnique": true
+        },
+        "apikey_reference_id_idx": {
+          "name": "apikey_reference_id_idx",
+          "columns": [
+            "referenceId"
+          ],
+          "isUnique": false
+        },
+        "apikey_config_id_idx": {
+          "name": "apikey_config_id_idx",
+          "columns": [
+            "configId"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "apikey_referenceId_user_id_fk": {
+          "name": "apikey_referenceId_user_id_fk",
+          "tableFrom": "apikey",
+          "tableTo": "user",
+          "columnsFrom": [
+            "referenceId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automation_runs": {
+      "name": "automation_runs",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "automation_id": {
+          "name": "automation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "skip_reason": {
+          "name": "skip_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "output": {
+          "name": "output",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scheduled_for": {
+          "name": "scheduled_for",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automation_runs_automation_started_idx": {
+          "name": "automation_runs_automation_started_idx",
+          "columns": [
+            "automation_id",
+            "started_at"
+          ],
+          "isUnique": false
+        },
+        "automation_runs_thread_idx": {
+          "name": "automation_runs_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automation_runs_automation_id_automations_id_fk": {
+          "name": "automation_runs_automation_id_automations_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "automations",
+          "columnsFrom": [
+            "automation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automation_runs_thread_id_threads_id_fk": {
+          "name": "automation_runs_thread_id_threads_id_fk",
+          "tableFrom": "automation_runs",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "automations": {
+      "name": "automations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "target_thread_id": {
+          "name": "target_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "trigger_config": {
+          "name": "trigger_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "run_mode": {
+          "name": "run_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "execution": {
+          "name": "execution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auto_archive": {
+          "name": "auto_archive",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_by_thread_id": {
+          "name": "created_by_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_run_status": {
+          "name": "last_run_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_run_thread_id": {
+          "name": "last_run_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "automations_project_idx": {
+          "name": "automations_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "automations_due_idx": {
+          "name": "automations_due_idx",
+          "columns": [
+            "enabled",
+            "trigger_type",
+            "next_run_at"
+          ],
+          "isUnique": false
+        },
+        "automations_target_thread_idx": {
+          "name": "automations_target_thread_idx",
+          "columns": [
+            "target_thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "automations_project_id_projects_id_fk": {
+          "name": "automations_project_id_projects_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "automations_target_thread_id_threads_id_fk": {
+          "name": "automations_target_thread_id_threads_id_fk",
+          "tableFrom": "automations",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "target_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "environments": {
+      "name": "environments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "managed": {
+          "name": "managed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_git_repo": {
+          "name": "is_git_repo",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_worktree": {
+          "name": "is_worktree",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "branch_name": {
+          "name": "branch_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_base_branch": {
+          "name": "merge_base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "destroy_attempt_id": {
+          "name": "destroy_attempt_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_provision_type": {
+          "name": "workspace_provision_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'provisioning'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "environments_host_path_idx": {
+          "name": "environments_host_path_idx",
+          "columns": [
+            "host_id",
+            "path"
+          ],
+          "isUnique": true
+        },
+        "environments_project_idx": {
+          "name": "environments_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "environments_status_idx": {
+          "name": "environments_status_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "environments_project_id_projects_id_fk": {
+          "name": "environments_project_id_projects_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "environments_host_id_hosts_id_fk": {
+          "name": "environments_host_id_hosts_id_fk",
+          "tableFrom": "environments",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "events": {
+      "name": "events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scope_kind": {
+          "name": "scope_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sequence": {
+          "name": "sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_id": {
+          "name": "item_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "data": {
+          "name": "data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "events_thread_sequence_idx": {
+          "name": "events_thread_sequence_idx",
+          "columns": [
+            "thread_id",
+            "sequence"
+          ],
+          "isUnique": true
+        },
+        "events_thread_type_item_kind_sequence_idx": {
+          "name": "events_thread_type_item_kind_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "item_kind",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_type_sequence_idx": {
+          "name": "events_thread_type_sequence_idx",
+          "columns": [
+            "thread_id",
+            "type",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_thread_turn_type_item_sequence_idx": {
+          "name": "events_thread_turn_type_item_sequence_idx",
+          "columns": [
+            "thread_id",
+            "turn_id",
+            "type",
+            "item_id",
+            "sequence"
+          ],
+          "isUnique": false
+        },
+        "events_environment_idx": {
+          "name": "events_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "events_completed_item_truncation_idx": {
+          "name": "events_completed_item_truncation_idx",
+          "columns": [
+            "item_kind",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"events\".\"type\" = 'item/completed'"
+        }
+      },
+      "foreignKeys": {
+        "events_thread_id_threads_id_fk": {
+          "name": "events_thread_id_threads_id_fk",
+          "tableFrom": "events",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "events_environment_id_environments_id_fk": {
+          "name": "events_environment_id_environments_id_fk",
+          "tableFrom": "events",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "events_scope_shape_check": {
+          "name": "events_scope_shape_check",
+          "value": "(\n        (\"events\".\"scope_kind\" = 'turn' AND \"events\".\"turn_id\" IS NOT NULL)\n        OR\n        (\"events\".\"scope_kind\" = 'thread' AND \"events\".\"turn_id\" IS NULL)\n      )"
+        }
+      }
+    },
+    "host_daemon_sessions": {
+      "name": "host_daemon_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "instance_id": {
+          "name": "instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_name": {
+          "name": "host_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_type": {
+          "name": "host_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "data_dir": {
+          "name": "data_dir",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "protocol_version": {
+          "name": "protocol_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "heartbeat_interval_ms": {
+          "name": "heartbeat_interval_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_timeout_ms": {
+          "name": "lease_timeout_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "host_daemon_sessions_host_status_idx": {
+          "name": "host_daemon_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_host_latest_idx": {
+          "name": "host_daemon_sessions_host_latest_idx",
+          "columns": [
+            "host_id",
+            "updated_at",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "host_daemon_sessions_closed_prune_idx": {
+          "name": "host_daemon_sessions_closed_prune_idx",
+          "columns": [
+            "status",
+            "closed_at",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "host_daemon_sessions_host_id_hosts_id_fk": {
+          "name": "host_daemon_sessions_host_id_hosts_id_fk",
+          "tableFrom": "host_daemon_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "hosts": {
+      "name": "hosts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "destroyed_at": {
+          "name": "destroyed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "hosts_last_seen_idx": {
+          "name": "hosts_last_seen_idx",
+          "columns": [
+            "last_seen_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "maintenance_scan_cursors": {
+      "name": "maintenance_scan_cursors",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "policy": {
+          "name": "policy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_kind": {
+          "name": "item_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "output_path": {
+          "name": "output_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_created_at": {
+          "name": "last_created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_event_id": {
+          "name": "last_event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "maintenance_scan_cursors_path_idx": {
+          "name": "maintenance_scan_cursors_path_idx",
+          "columns": [
+            "policy",
+            "version",
+            "item_kind",
+            "output_path"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "pending_interactions": {
+      "name": "pending_interactions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "turn_id": {
+          "name": "turn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_thread_id": {
+          "name": "provider_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_request_id": {
+          "name": "provider_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolution": {
+          "name": "resolution",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_reason": {
+          "name": "status_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "resolved_at": {
+          "name": "resolved_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "pending_interactions_provider_request_idx": {
+          "name": "pending_interactions_provider_request_idx",
+          "columns": [
+            "provider_id",
+            "provider_thread_id",
+            "provider_request_id"
+          ],
+          "isUnique": true
+        },
+        "pending_interactions_thread_created_idx": {
+          "name": "pending_interactions_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_thread_status_created_idx": {
+          "name": "pending_interactions_thread_status_created_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        },
+        "pending_interactions_status_created_idx": {
+          "name": "pending_interactions_status_created_idx",
+          "columns": [
+            "status",
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pending_interactions_thread_id_threads_id_fk": {
+          "name": "pending_interactions_thread_id_threads_id_fk",
+          "tableFrom": "pending_interactions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_execution_defaults": {
+      "name": "project_execution_defaults",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_execution_defaults_project_idx": {
+          "name": "project_execution_defaults_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_execution_defaults_project_id_projects_id_fk": {
+          "name": "project_execution_defaults_project_id_projects_id_fk",
+          "tableFrom": "project_execution_defaults",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "project_sources": {
+      "name": "project_sources",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "project_sources_project_idx": {
+          "name": "project_sources_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_host_idx": {
+          "name": "project_sources_host_idx",
+          "columns": [
+            "host_id"
+          ],
+          "isUnique": false
+        },
+        "project_sources_project_host_idx": {
+          "name": "project_sources_project_host_idx",
+          "columns": [
+            "project_id",
+            "host_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "project_sources_project_id_projects_id_fk": {
+          "name": "project_sources_project_id_projects_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "project_sources_host_id_hosts_id_fk": {
+          "name": "project_sources_host_id_hosts_id_fk",
+          "tableFrom": "project_sources",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "project_sources_shape_check": {
+          "name": "project_sources_shape_check",
+          "value": "(\n        \"project_sources\".\"type\" = 'local_path' AND \"project_sources\".\"host_id\" IS NOT NULL AND \"project_sources\".\"path\" IS NOT NULL\n      )"
+        }
+      }
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'standard'"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'V'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "projects_updated_idx": {
+          "name": "projects_updated_idx",
+          "columns": [
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "projects_deleted_idx": {
+          "name": "projects_deleted_idx",
+          "columns": [
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "projects_sort_idx": {
+          "name": "projects_sort_idx",
+          "columns": [
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "projects_personal_singleton_idx": {
+          "name": "projects_personal_singleton_idx",
+          "columns": [
+            "kind"
+          ],
+          "isUnique": true,
+          "where": "\"projects\".\"kind\" = 'personal'"
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "prompt_history_entries": {
+      "name": "prompt_history_entries",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "request_sequence": {
+          "name": "request_sequence",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "input": {
+          "name": "input",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "prompt_history_entries_thread_request_idx": {
+          "name": "prompt_history_entries_thread_request_idx",
+          "columns": [
+            "thread_id",
+            "request_sequence"
+          ],
+          "isUnique": true
+        },
+        "prompt_history_entries_project_scope_created_idx": {
+          "name": "prompt_history_entries_project_scope_created_idx",
+          "columns": [
+            "project_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "prompt_history_entries_thread_scope_created_idx": {
+          "name": "prompt_history_entries_thread_scope_created_idx",
+          "columns": [
+            "thread_id",
+            "scope",
+            "created_at",
+            "request_sequence",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "prompt_history_entries_project_id_projects_id_fk": {
+          "name": "prompt_history_entries_project_id_projects_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "prompt_history_entries_thread_id_threads_id_fk": {
+          "name": "prompt_history_entries_thread_id_threads_id_fk",
+          "tableFrom": "prompt_history_entries",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "queued_thread_messages": {
+      "name": "queued_thread_messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender_thread_id": {
+          "name": "sender_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "reasoning_level": {
+          "name": "reasoning_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission_mode": {
+          "name": "permission_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "service_tier": {
+          "name": "service_tier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "claim_token": {
+          "name": "claim_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sort_key": {
+          "name": "sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "queued_thread_messages_thread_created_idx": {
+          "name": "queued_thread_messages_thread_created_idx",
+          "columns": [
+            "thread_id",
+            "created_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "queued_thread_messages_thread_sort_idx": {
+          "name": "queued_thread_messages_thread_sort_idx",
+          "columns": [
+            "thread_id",
+            "sort_key",
+            "id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "queued_thread_messages_thread_id_threads_id_fk": {
+          "name": "queued_thread_messages_thread_id_threads_id_fk",
+          "tableFrom": "queued_thread_messages",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "system_experiments": {
+      "name": "system_experiments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "claude_code_mock_cli_traffic": {
+          "name": "claude_code_mock_cli_traffic",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat": {
+          "name": "popout_chat",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "popout_chat_hotkey": {
+          "name": "popout_chat_hotkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "terminal_sessions": {
+      "name": "terminal_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host_id": {
+          "name": "host_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "daemon_session_id": {
+          "name": "daemon_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "initial_cwd": {
+          "name": "initial_cwd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cols": {
+          "name": "cols",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rows": {
+          "name": "rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "exit_code": {
+          "name": "exit_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "close_reason": {
+          "name": "close_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_user_input_at": {
+          "name": "last_user_input_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "terminal_sessions_thread_status_updated_idx": {
+          "name": "terminal_sessions_thread_status_updated_idx",
+          "columns": [
+            "thread_id",
+            "status",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_environment_status_idx": {
+          "name": "terminal_sessions_environment_status_idx",
+          "columns": [
+            "environment_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_host_status_idx": {
+          "name": "terminal_sessions_host_status_idx",
+          "columns": [
+            "host_id",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "terminal_sessions_daemon_session_idx": {
+          "name": "terminal_sessions_daemon_session_idx",
+          "columns": [
+            "daemon_session_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminal_sessions_thread_id_threads_id_fk": {
+          "name": "terminal_sessions_thread_id_threads_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_environment_id_environments_id_fk": {
+          "name": "terminal_sessions_environment_id_environments_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_host_id_hosts_id_fk": {
+          "name": "terminal_sessions_host_id_hosts_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "hosts",
+          "columnsFrom": [
+            "host_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk": {
+          "name": "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk",
+          "tableFrom": "terminal_sessions",
+          "tableTo": "host_daemon_sessions",
+          "columnsFrom": [
+            "daemon_session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_dynamic_context_file_states": {
+      "name": "thread_dynamic_context_file_states",
+      "columns": {
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_key": {
+          "name": "file_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_status": {
+          "name": "content_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "shown_at": {
+          "name": "shown_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_dynamic_context_file_states_thread_file_idx": {
+          "name": "thread_dynamic_context_file_states_thread_file_idx",
+          "columns": [
+            "thread_id",
+            "file_key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "thread_dynamic_context_file_states_thread_id_threads_id_fk": {
+          "name": "thread_dynamic_context_file_states_thread_id_threads_id_fk",
+          "tableFrom": "thread_dynamic_context_file_states",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_folders": {
+      "name": "thread_folders",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_folders_global_path_idx": {
+          "name": "thread_folders_global_path_idx",
+          "columns": [
+            "path"
+          ],
+          "isUnique": true,
+          "where": "\"thread_folders\".\"project_id\" IS NULL"
+        },
+        "thread_folders_project_path_idx": {
+          "name": "thread_folders_project_path_idx",
+          "columns": [
+            "project_id",
+            "path"
+          ],
+          "isUnique": true,
+          "where": "\"thread_folders\".\"project_id\" IS NOT NULL"
+        },
+        "thread_folders_project_idx": {
+          "name": "thread_folders_project_idx",
+          "columns": [
+            "project_id"
+          ],
+          "isUnique": false
+        },
+        "thread_folders_updated_idx": {
+          "name": "thread_folders_updated_idx",
+          "columns": [
+            "updated_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "thread_folders_project_id_projects_id_fk": {
+          "name": "thread_folders_project_id_projects_id_fk",
+          "tableFrom": "thread_folders",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "thread_search_segments": {
+      "name": "thread_search_segments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thread_id": {
+          "name": "thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_kind": {
+          "name": "source_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_key": {
+          "name": "source_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_seq": {
+          "name": "source_seq",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "thread_search_segments_source_idx": {
+          "name": "thread_search_segments_source_idx",
+          "columns": [
+            "thread_id",
+            "source_kind",
+            "source_key"
+          ],
+          "isUnique": true
+        },
+        "thread_search_segments_thread_idx": {
+          "name": "thread_search_segments_thread_idx",
+          "columns": [
+            "thread_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "thread_search_segments_thread_id_threads_id_fk": {
+          "name": "thread_search_segments_thread_id_threads_id_fk",
+          "tableFrom": "thread_search_segments",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "threads": {
+      "name": "threads",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "environment_id": {
+          "name": "environment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "model_override": {
+          "name": "model_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "reasoning_level_override": {
+          "name": "reasoning_level_override",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title_fallback": {
+          "name": "title_fallback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "folder_path": {
+          "name": "folder_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'starting'"
+        },
+        "parent_thread_id": {
+          "name": "parent_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "source_thread_id": {
+          "name": "source_thread_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "origin_kind": {
+          "name": "origin_kind",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "child_origin": {
+          "name": "child_origin",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pinned_at": {
+          "name": "pinned_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pin_sort_key": {
+          "name": "pin_sort_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_read_at": {
+          "name": "last_read_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "latest_attention_at": {
+          "name": "latest_attention_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "threads_project_updated_idx": {
+          "name": "threads_project_updated_idx",
+          "columns": [
+            "project_id",
+            "updated_at"
+          ],
+          "isUnique": false
+        },
+        "threads_project_archived_deleted_idx": {
+          "name": "threads_project_archived_deleted_idx",
+          "columns": [
+            "project_id",
+            "archived_at",
+            "deleted_at",
+            "id"
+          ],
+          "isUnique": false
+        },
+        "threads_pin_sort_idx": {
+          "name": "threads_pin_sort_idx",
+          "columns": [
+            "archived_at",
+            "deleted_at",
+            "pin_sort_key",
+            "id"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"pinned_at\" IS NOT NULL"
+        },
+        "threads_environment_idx": {
+          "name": "threads_environment_idx",
+          "columns": [
+            "environment_id"
+          ],
+          "isUnique": false
+        },
+        "threads_parent_idx": {
+          "name": "threads_parent_idx",
+          "columns": [
+            "parent_thread_id"
+          ],
+          "isUnique": false
+        },
+        "threads_source_origin_idx": {
+          "name": "threads_source_origin_idx",
+          "columns": [
+            "source_thread_id",
+            "origin_kind"
+          ],
+          "isUnique": false
+        },
+        "threads_archived_status_idx": {
+          "name": "threads_archived_status_idx",
+          "columns": [
+            "archived_at",
+            "status"
+          ],
+          "isUnique": false
+        },
+        "threads_environment_archived_deleted_idx": {
+          "name": "threads_environment_archived_deleted_idx",
+          "columns": [
+            "environment_id",
+            "archived_at",
+            "deleted_at"
+          ],
+          "isUnique": false
+        },
+        "threads_active_maintenance_idx": {
+          "name": "threads_active_maintenance_idx",
+          "columns": [
+            "status"
+          ],
+          "isUnique": false,
+          "where": "\"threads\".\"deleted_at\" IS NULL"
+        }
+      },
+      "foreignKeys": {
+        "threads_project_id_projects_id_fk": {
+          "name": "threads_project_id_projects_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "threads_environment_id_environments_id_fk": {
+          "name": "threads_environment_id_environments_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "environments",
+          "columnsFrom": [
+            "environment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_parent_thread_id_threads_id_fk": {
+          "name": "threads_parent_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "parent_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "threads_source_thread_id_threads_id_fk": {
+          "name": "threads_source_thread_id_threads_id_fk",
+          "tableFrom": "threads",
+          "tableTo": "threads",
+          "columnsFrom": [
+            "source_thread_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index d007f1d99..c361ab1f8 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -309,6 +309,13 @@
       "when": 1781851451425,
       "tag": "0043_unique_phantom_reporter",
       "breakpoints": true
+    },
+    {
+      "idx": 44,
+      "version": "6",
+      "when": 1781856789567,
+      "tag": "0044_solid_mysterio",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/data/thread-folders.ts b/packages/db/src/data/thread-folders.ts
index f7ff4f5fa..ecc187c0e 100644
--- a/packages/db/src/data/thread-folders.ts
+++ b/packages/db/src/data/thread-folders.ts
@@ -1,4 +1,4 @@
-import { asc, eq } from "drizzle-orm";
+import { and, asc, eq, isNull } from "drizzle-orm";
 import { PERSONAL_PROJECT_ID } from "@bb/domain";
 import type {
   DbConnection,
@@ -15,6 +15,7 @@ export type ThreadFolderRow = typeof threadFolders.$inferSelect;
 
 export interface CreateThreadFolderInput {
   path: string;
+  projectId?: string | null;
 }
 
 function splitFolderSegments(path: string): string[] {
@@ -43,16 +44,21 @@ function folderAncestors(path: string): string[] {
 export function getThreadFolderByPath(
   db: DbQueryConnection,
   path: string,
+  projectId: string | null = null,
 ): ThreadFolderRow | null {
   const normalized = normalizeThreadFolderPath(path);
   if (!normalized) {
     return null;
   }
+  const projectFilter =
+    projectId === null
+      ? isNull(threadFolders.projectId)
+      : eq(threadFolders.projectId, projectId);
   return (
     db
       .select()
       .from(threadFolders)
-      .where(eq(threadFolders.path, normalized))
+      .where(and(eq(threadFolders.path, normalized), projectFilter))
       .get() ?? null
   );
 }
@@ -61,7 +67,11 @@ export function listThreadFolders(db: DbQueryConnection): ThreadFolderRow[] {
   return db
     .select()
     .from(threadFolders)
-    .orderBy(asc(threadFolders.path), asc(threadFolders.id))
+    .orderBy(
+      asc(threadFolders.projectId),
+      asc(threadFolders.path),
+      asc(threadFolders.id),
+    )
     .all();
 }
 
@@ -69,11 +79,13 @@ export function ensureThreadFolderPath(
   db: ThreadFolderWriteConnection,
   notifier: DbNotifier,
   path: string | null | undefined,
+  projectId: string | null = null,
 ): ThreadFolderRow | null {
   const normalized = normalizeThreadFolderPath(path);
   if (!normalized) {
     return null;
   }
+  const scopedProjectId = projectId ?? null;
 
   const now = Date.now();
   let createdAny = false;
@@ -84,6 +96,7 @@ export function ensureThreadFolderPath(
         .insert(threadFolders)
         .values({
           id: createThreadFolderId(),
+          projectId: scopedProjectId,
           path: ancestorPath,
           createdAt: now,
           updatedAt: now,
@@ -96,11 +109,13 @@ export function ensureThreadFolderPath(
       deepest = inserted;
       continue;
     }
-    deepest = getThreadFolderByPath(db, ancestorPath);
+    deepest = getThreadFolderByPath(db, ancestorPath, scopedProjectId);
   }
 
   if (createdAny) {
-    notifier.notifyProject(PERSONAL_PROJECT_ID, ["threads-changed"]);
+    notifier.notifyProject(scopedProjectId ?? PERSONAL_PROJECT_ID, [
+      "threads-changed",
+    ]);
   }
   return deepest;
 }
@@ -110,7 +125,12 @@ export function createThreadFolder(
   notifier: DbNotifier,
   input: CreateThreadFolderInput,
 ): ThreadFolderRow {
-  const folder = ensureThreadFolderPath(db, notifier, input.path);
+  const folder = ensureThreadFolderPath(
+    db,
+    notifier,
+    input.path,
+    input.projectId ?? null,
+  );
   if (!folder) {
     throw new Error("Thread folder path cannot be empty");
   }
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index c1e3df023..d810bec82 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -288,7 +288,12 @@ export function createThread(
         })
         .returning()
         .get();
-      ensureThreadFolderPath(tx, notifier, createdThread.folderPath);
+      ensureThreadFolderPath(
+        tx,
+        notifier,
+        createdThread.folderPath,
+        createdThread.projectId,
+      );
       upsertThreadTitleSearchSegments(tx, {
         threadId: createdThread.id,
         title: createdThread.title,
@@ -1548,7 +1553,7 @@ export function updateThread(
   const set: Partial<typeof threads.$inferInsert> = { updatedAt: now };
   if ("title" in input) set.title = input.title;
   if ("folderPath" in input) {
-    ensureThreadFolderPath(db, notifier, input.folderPath);
+    ensureThreadFolderPath(db, notifier, input.folderPath, existing.projectId);
     set.folderPath = input.folderPath;
   }
   if ("environmentId" in input) set.environmentId = input.environmentId;
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index db3b76fc7..e20d0d8b4 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -311,12 +311,21 @@ export const threadFolders = sqliteTable(
   "thread_folders",
   {
     id: text("id").primaryKey(),
+    projectId: text("project_id").references(() => projects.id, {
+      onDelete: "cascade",
+    }),
     path: text("path").notNull(),
     createdAt: integer("created_at").notNull(),
     updatedAt: integer("updated_at").notNull(),
   },
   (table) => [
-    uniqueIndex("thread_folders_path_idx").on(table.path),
+    uniqueIndex("thread_folders_global_path_idx")
+      .on(table.path)
+      .where(sql`${table.projectId} IS NULL`),
+    uniqueIndex("thread_folders_project_path_idx")
+      .on(table.projectId, table.path)
+      .where(sql`${table.projectId} IS NOT NULL`),
+    index("thread_folders_project_idx").on(table.projectId),
     index("thread_folders_updated_idx").on(table.updatedAt),
   ],
 );
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 2d3addfda..57599c8a0 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -623,9 +623,14 @@ describe("threads", () => {
     });
 
     expect(updated?.folderPath).toBe("Work/Q3");
-    expect(listThreadFolders(db).map((folder) => folder.path)).toEqual([
-      "Work",
-      "Work/Q3",
+    expect(
+      listThreadFolders(db).map((folder) => ({
+        path: folder.path,
+        projectId: folder.projectId,
+      })),
+    ).toEqual([
+      { path: "Work", projectId: project.id },
+      { path: "Work/Q3", projectId: project.id },
     ]);
     expect(spy.notifyThread).toHaveBeenCalledWith(
       thread.id,
@@ -646,6 +651,42 @@ describe("threads", () => {
       "Work",
       "Work/Q3",
     ]);
+    expect(folder.projectId).toBeNull();
+  });
+
+  it("scopes explicit thread folders by project", () => {
+    const { db, host, project } = setup();
+    const { project: otherProject } = createProject(db, noopNotifier, {
+      name: "other-project",
+      source: { type: "local_path", hostId: host.id, path: "/tmp/other" },
+    });
+
+    const first = createThreadFolder(db, noopNotifier, {
+      path: "Work",
+      projectId: project.id,
+    });
+    const second = createThreadFolder(db, noopNotifier, {
+      path: "Work",
+      projectId: otherProject.id,
+    });
+
+    expect(first.projectId).toBe(project.id);
+    expect(second.projectId).toBe(otherProject.id);
+    const folders = listThreadFolders(db)
+      .map((entry) => ({
+        path: entry.path,
+        projectId: entry.projectId,
+      }))
+      .sort((left, right) =>
+        (left.projectId ?? "").localeCompare(right.projectId ?? ""),
+      );
+    const expectedFolders = [
+      { path: "Work", projectId: project.id },
+      { path: "Work", projectId: otherProject.id },
+    ].sort((left, right) =>
+      (left.projectId ?? "").localeCompare(right.projectId ?? ""),
+    );
+    expect(folders).toEqual(expectedFolders);
   });
 
   it("notifies when a thread parent changes", () => {
diff --git a/packages/server-contract/src/api/projects.ts b/packages/server-contract/src/api/projects.ts
index 85ed98c35..0fabeecd3 100644
--- a/packages/server-contract/src/api/projects.ts
+++ b/packages/server-contract/src/api/projects.ts
@@ -57,6 +57,7 @@ export type CreateProjectRequest = z.infer<typeof createProjectRequestSchema>;
 export const threadFolderSchema = z
   .object({
     id: z.string(),
+    projectId: z.string().min(1).nullable(),
     path: z.string().min(1),
     createdAt: z.number(),
     updatedAt: z.number(),
@@ -67,6 +68,7 @@ export type ThreadFolderResponse = z.infer<typeof threadFolderSchema>;
 export const createThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
+    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type CreateThreadFolderRequest = z.infer<

From 00e83c506675ec127a838d0a9397f76279e0da40 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:22:34 -0700
Subject: [PATCH 15/54] Limit thread folders to folder view

---
 .../src/components/sidebar/ProjectList.tsx    | 109 ++++++------------
 .../sidebar/ProjectListProjects.tsx           |   9 --
 .../app/src/components/sidebar/ProjectRow.tsx |  43 ++-----
 .../SidebarViewOptionsMenu.stories.tsx        |   2 +-
 .../sidebar/sidebarCollapsedAtoms.ts          |   6 +-
 5 files changed, 47 insertions(+), 122 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 113e72bfd..858d803db 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -405,29 +405,6 @@ function uniqueFolderPaths(
   return Array.from(paths).sort((left, right) => left.localeCompare(right));
 }
 
-function groupFolderPathsByProjectId(
-  folders: readonly ThreadFolderResponse[],
-): ReadonlyMap<string, readonly string[]> {
-  const pathsByProjectId = new Map<string, string[]>();
-  for (const folder of folders) {
-    if (folder.projectId === null) {
-      continue;
-    }
-    const paths = pathsByProjectId.get(folder.projectId);
-    if (paths) {
-      paths.push(folder.path);
-    } else {
-      pathsByProjectId.set(folder.projectId, [folder.path]);
-    }
-  }
-
-  for (const paths of pathsByProjectId.values()) {
-    paths.sort((left, right) => left.localeCompare(right));
-  }
-
-  return pathsByProjectId;
-}
-
 function ProjectListSectionIconButton({
   ariaLabel,
   disabled = false,
@@ -603,7 +580,7 @@ export function SidebarViewOptionsMenu({
           }}
         />
         <SidebarOrganizeMenuOption
-          label="None"
+          label="Folders"
           selected={organizationMode === "chronological"}
           onSelect={(event) => {
             event.preventDefault();
@@ -1012,10 +989,6 @@ function ProjectListComponent({
   const sidebarNavigationQuery = useSidebarNavigation();
   const sidebarNavigation = sidebarNavigationQuery.data;
   const folders = sidebarNavigation?.folders ?? EMPTY_FOLDER_DEFINITIONS;
-  const folderPathsByProjectId = useMemo(
-    () => groupFolderPathsByProjectId(folders),
-    [folders],
-  );
   const chronologicalFolderPaths = useMemo(
     () => uniqueFolderPaths(folders),
     [folders],
@@ -1172,34 +1145,28 @@ function ProjectListComponent({
   const handleCreateProjectlessThread = useCallback(() => {
     openRootComposeForProject(PERSONAL_PROJECT_ID);
   }, [openRootComposeForProject]);
-  const [folderCreateProjectId, setFolderCreateProjectId] = useState<
-    string | null
-  >(null);
-  const isFolderCreateDialogOpen = folderCreateProjectId !== null;
-  const handleOpenCreateProjectFolderDialog = useCallback(
-    (projectId: string) => {
-      setFolderCreateProjectId(projectId);
-    },
-    [],
-  );
-  const handleOpenCreateProjectlessFolderDialog = useCallback(() => {
-    setFolderCreateProjectId(PERSONAL_PROJECT_ID);
+  const [folderCreateTarget, setFolderCreateTarget] = useState<{
+    projectId: string | null;
+  } | null>(null);
+  const isFolderCreateDialogOpen = folderCreateTarget !== null;
+  const handleOpenCreateFolderDialog = useCallback(() => {
+    setFolderCreateTarget({ projectId: null });
   }, []);
   const handleCreateFolderDialogOpenChange = useCallback((open: boolean) => {
     if (!open) {
-      setFolderCreateProjectId(null);
+      setFolderCreateTarget(null);
     }
   }, []);
   const handleCreateThreadFolder = useCallback(
     (path: string) => {
       createThreadFolderMutate(
-        { path, projectId: folderCreateProjectId },
+        { path, projectId: folderCreateTarget?.projectId ?? null },
         {
-          onSuccess: () => setFolderCreateProjectId(null),
+          onSuccess: () => setFolderCreateTarget(null),
         },
       );
     },
-    [createThreadFolderMutate, folderCreateProjectId],
+    [createThreadFolderMutate, folderCreateTarget],
   );
   const handleOpenProjectlessArchivedThreads = useCallback(() => {
     onProjectSelect?.();
@@ -1266,7 +1233,10 @@ function ProjectListComponent({
   const [chronologicalSort, setChronologicalSort] = useAtom(
     sidebarChronologicalSortAtom,
   );
-  const groupBy = "folder" as const;
+  const isFolderOrganizationMode = organizationMode === "chronological";
+  const groupBy = isFolderOrganizationMode
+    ? ("folder" as const)
+    : ("none" as const);
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
@@ -1385,26 +1355,22 @@ function ProjectListComponent({
       removeCollapsedIds(current, environmentIdsToExpand),
     );
 
-    // Also un-collapse folder ancestors hiding the selected thread. In
-    // project/pinned mode use the top-level ancestor the walk above ended on;
-    // in the flat chronological list the selected thread is itself top-level.
+    // Also un-collapse folder ancestors hiding the selected thread in the
+    // cross-project Folders view.
     const isPinned =
       pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
-    const isChronological = !isPinned && organizationMode === "chronological";
-    const topLevelAncestor = currentThread ?? selectedThread;
-    const folderSource = isChronological ? selectedThread : topLevelAncestor;
-    const folderContainerId = isPinned
-      ? PINNED_CONTAINER_ID
-      : isChronological
-        ? CHRONOLOGICAL_CONTAINER_ID
-        : selectedThread.projectId;
-    const folderKeysToExpand = new Set(
-      folderAncestorKeys(folderContainerId, folderSource.folderPath),
-    );
-    if (folderKeysToExpand.size > 0) {
-      setCollapsedFolderList((current) =>
-        removeCollapsedIds(current, folderKeysToExpand),
+    if (isFolderOrganizationMode) {
+      const folderContainerId = isPinned
+        ? PINNED_CONTAINER_ID
+        : CHRONOLOGICAL_CONTAINER_ID;
+      const folderKeysToExpand = new Set(
+        folderAncestorKeys(folderContainerId, selectedThread.folderPath),
       );
+      if (folderKeysToExpand.size > 0) {
+        setCollapsedFolderList((current) =>
+          removeCollapsedIds(current, folderKeysToExpand),
+        );
+      }
     }
 
     if (pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId)) {
@@ -1425,7 +1391,7 @@ function ProjectListComponent({
       removeCollapsedIds(current, new Set(["projects"])),
     );
   }, [
-    organizationMode,
+    isFolderOrganizationMode,
     pinnedSidebarState.effectivePinnedThreadIds,
     selectedThreadId,
     setCollapsedEnvironmentIdList,
@@ -1585,9 +1551,9 @@ function ProjectListComponent({
     threads: threadsByProject.get(PERSONAL_PROJECT_ID),
   });
 
-  // Chronological mode flattens every non-pinned thread (across all projects)
-  // into a single bucket. Pinned threads and their descendants stay in the
-  // Pinned section, matching how project mode excludes them.
+  // Folders mode flattens every non-pinned thread across projects into one
+  // folder-aware bucket. Pinned threads and descendants stay in Pinned,
+  // matching how project mode excludes them.
   const nonPinnedThreads = useMemo(
     () =>
       threads.filter(
@@ -1625,8 +1591,6 @@ function ProjectListComponent({
       compareThreads={sidebarThreadComparator}
       onProjectSelect={onProjectSelect}
       onCreateProjectThread={handleCreateProjectThread}
-      onCreateProjectFolder={handleOpenCreateProjectFolderDialog}
-      folderPathsByProjectId={folderPathsByProjectId}
       onToggleProjectCollapsed={toggleProjectCollapsed}
       onToggleThreadCollapsed={toggleThreadCollapsed}
       onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
@@ -1641,7 +1605,6 @@ function ProjectListComponent({
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
       compareThreads={sidebarThreadComparator}
-      folderPaths={folderPathsByProjectId.get(PERSONAL_PROJECT_ID)}
       variant="section"
       onProjectSelect={onProjectSelect}
       onToggleThreadCollapsed={toggleThreadCollapsed}
@@ -1694,9 +1657,7 @@ function ProjectListComponent({
       <ProjectListThreadsSectionActions
         isCreatingFolder={isCreateThreadFolderPending}
         onNewFolder={
-          organizationMode === "chronological"
-            ? undefined
-            : handleOpenCreateProjectlessFolderDialog
+          isFolderOrganizationMode ? handleOpenCreateFolderDialog : undefined
         }
         onNewThread={handleCreateProjectlessThread}
       />
@@ -1736,7 +1697,7 @@ function ProjectListComponent({
     );
   }
 
-  if (organizationMode === "chronological") {
+  if (isFolderOrganizationMode) {
     return (
       <ProjectListShell>
         <div className="space-y-4">
@@ -1746,7 +1707,7 @@ function ProjectListComponent({
             </TopLevelSidebarSection>
           ) : null}
           <TopLevelSidebarSection
-            label="All Threads"
+            label="Folders"
             actions={threadsSectionActions}
             actionsOpen={
               isThreadsActionsMenuOpen || isThreadsViewOptionsMenuOpen
diff --git a/apps/app/src/components/sidebar/ProjectListProjects.tsx b/apps/app/src/components/sidebar/ProjectListProjects.tsx
index ad94d3ba0..2d1e5ef62 100644
--- a/apps/app/src/components/sidebar/ProjectListProjects.tsx
+++ b/apps/app/src/components/sidebar/ProjectListProjects.tsx
@@ -51,10 +51,8 @@ export interface ProjectListProjectsProps {
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
   compareThreads: ThreadComparator;
-  folderPathsByProjectId?: ReadonlyMap<string, readonly string[]>;
   onProjectSelect?: () => void;
   onCreateProjectThread?: (projectId: string) => void;
-  onCreateProjectFolder?: (projectId: string) => void;
   onToggleProjectCollapsed: (projectId: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
@@ -65,8 +63,6 @@ interface SortableProjectRowProps extends ProjectRowProps {
   reorderDisabled: boolean;
 }
 
-const EMPTY_FOLDER_PATHS: readonly string[] = [];
-
 const SortableProjectRow = memo(function SortableProjectRow({
   project,
   reorderDisabled,
@@ -103,10 +99,8 @@ export function ProjectListProjects({
   collapsedThreadIds,
   collapsedEnvironmentIds,
   compareThreads,
-  folderPathsByProjectId,
   onProjectSelect,
   onCreateProjectThread,
-  onCreateProjectFolder,
   onToggleProjectCollapsed,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
@@ -115,8 +109,6 @@ export function ProjectListProjects({
   const sharedRowProps = (row: ProjectListRowModel) => ({
     project: row.project,
     threadListState: row.threadListState,
-    folderPaths:
-      folderPathsByProjectId?.get(row.project.id) ?? EMPTY_FOLDER_PATHS,
     selectedThreadId,
     isActive: row.isActive,
     isCollapsed: collapsedProjectIds.has(row.project.id),
@@ -126,7 +118,6 @@ export function ProjectListProjects({
     isLocalPathInvalid: row.isLocalPathInvalid,
     onProjectSelect,
     onCreateProjectThread,
-    onCreateProjectFolder,
     onToggleProjectCollapsed,
     onToggleThreadCollapsed,
     onToggleEnvironmentCollapsed,
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 9062843fc..dc59dd226 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -136,7 +136,6 @@ export interface ProjectRowProps {
   isLocalPathInvalid: boolean;
   onProjectSelect?: () => void;
   onCreateProjectThread?: (projectId: string) => void;
-  onCreateProjectFolder?: (projectId: string) => void;
   onToggleProjectCollapsed: (projectId: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
@@ -271,8 +270,8 @@ interface ManualThreadTreeLookup {
 }
 
 // Render key + routing projectId for any item kind. Folders derive from their
-// first nested item, so a folder spanning projects (chronological) still routes
-// each contained thread to its own project.
+// first nested item, so a folder spanning projects in the Folders view still
+// routes each contained thread to its own project.
 export function getItemKey(item: ProjectThreadItem): string {
   switch (item.kind) {
     case "thread":
@@ -1459,7 +1458,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
 }: ProjectThreadTreeProps) {
-  const groupBy = "folder" as const;
+  const groupBy = "none" as const;
   const projectThreads =
     threadListState.status === "ready"
       ? threadListState.threads
@@ -1548,11 +1547,11 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   );
 });
 
-// Flat "All Threads" bucket for chronological mode: one top-level row per
-// non-pinned thread across all projects, globally ordered by the chosen
-// comparator (no parent/child nesting or worktree grouping, so nothing hides
-// behind a collapsed parent). Derives projectId per row from its own thread so
-// cross-project rows still route correctly.
+// Flat Folders bucket: one top-level row per non-pinned thread across all
+// projects, globally ordered by the chosen comparator before folder bucketing.
+// It intentionally drops parent/child nesting and worktree grouping so nothing
+// hides behind a collapsed parent. Derives projectId per row from its own
+// thread so cross-project rows still route correctly.
 export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   threadListState,
   compareThreads,
@@ -1659,7 +1658,6 @@ function ProjectRowComponent({
   isLocalPathInvalid,
   onProjectSelect,
   onCreateProjectThread,
-  onCreateProjectFolder,
   onToggleProjectCollapsed,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
@@ -1688,9 +1686,6 @@ function ProjectRowComponent({
   const handleCreateThread = useCallback(() => {
     onCreateProjectThread?.(project.id);
   }, [onCreateProjectThread, project.id]);
-  const handleCreateFolder = useCallback(() => {
-    onCreateProjectFolder?.(project.id);
-  }, [onCreateProjectFolder, project.id]);
   return (
     <SidebarStickyGroup asChild data-sidebar-sticky-project-item="">
       <SidebarMenuItem
@@ -1792,27 +1787,6 @@ function ProjectRowComponent({
                   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
                 )}
               />
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon"
-                aria-label={`New folder in ${project.name}`}
-                title="New folder"
-                disabled={!onCreateProjectFolder}
-                onClick={(event) => {
-                  event.stopPropagation();
-                  handleCreateFolder();
-                }}
-                className={cn(
-                  "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                )}
-              >
-                <Icon
-                  name="FolderPlus"
-                  className={COARSE_POINTER_ICON_SIZE_CLASS}
-                />
-              </Button>
               <Button
                 type="button"
                 variant="ghost"
@@ -1943,7 +1917,6 @@ function areProjectRowPropsEqual(
     prev.isLocalPathInvalid !== next.isLocalPathInvalid ||
     prev.onProjectSelect !== next.onProjectSelect ||
     prev.onCreateProjectThread !== next.onCreateProjectThread ||
-    prev.onCreateProjectFolder !== next.onCreateProjectFolder ||
     prev.onToggleProjectCollapsed !== next.onToggleProjectCollapsed ||
     prev.onToggleThreadCollapsed !== next.onToggleThreadCollapsed ||
     prev.onToggleEnvironmentCollapsed !== next.onToggleEnvironmentCollapsed ||
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 9580ee4b0..0aa81ff8a 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -41,7 +41,7 @@ export function Overview() {
       <StoryRow label="project" hint="organize by project">
         <MenuStory sort="updated" organizationMode="project" />
       </StoryRow>
-      <StoryRow label="none" hint="cross-project chronological view">
+      <StoryRow label="folders" hint="cross-project folder view">
         <MenuStory sort="created" organizationMode="chronological" />
       </StoryRow>
     </StoryCard>
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index a80987310..05cebc330 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -15,8 +15,8 @@ const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
 export type SidebarSectionId = "pinned" | "projects" | "threads";
 export type CollapsibleSidebarSectionId = "projects" | "threads";
 
-// "project" keeps the per-project grouping; "chronological" flattens every
-// non-pinned thread into a single All Threads bucket.
+// "project" keeps the per-project grouping; "chronological" is the persisted
+// value for the cross-project Folders view that replaced the old None view.
 export type SidebarOrganizationMode = "project" | "chronological";
 // Controls thread ordering in both grouped and ungrouped sidebar views.
 // "updated" reuses the status-aware activity heuristic; "created" sorts by
@@ -91,7 +91,7 @@ export const sidebarChronologicalSortAtom =
   );
 
 // Story/test control for the low-level folder grouping path. Runtime sidebar
-// trees pass "folder" directly so stored folderPath metadata always renders.
+// trees enable "folder" only in the Folders organization mode.
 export const sidebarGroupByAtom = atomWithStorage<SidebarGroupBy>(
   GROUP_BY_STORAGE_KEY,
   "none",

From 502ca91af15960447f93e60cd866e42b0628665a Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:27:12 -0700
Subject: [PATCH 16/54] Keep pinned threads flat with folders

---
 .../components/sidebar/PinnedThreadTree.tsx   | 51 +++----------------
 .../src/components/sidebar/ProjectList.tsx    | 23 +++------
 .../sidebar/pinnedSidebarThreads.test.ts      | 36 +------------
 .../sidebar/pinnedSidebarThreads.ts           | 24 ---------
 4 files changed, 16 insertions(+), 118 deletions(-)

diff --git a/apps/app/src/components/sidebar/PinnedThreadTree.tsx b/apps/app/src/components/sidebar/PinnedThreadTree.tsx
index c11eb1a27..1b9f183ab 100644
--- a/apps/app/src/components/sidebar/PinnedThreadTree.tsx
+++ b/apps/app/src/components/sidebar/PinnedThreadTree.tsx
@@ -5,18 +5,10 @@ import {
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import type { NeighborReorderRequest } from "@/lib/neighbor-reorder";
-import {
-  getItemKey,
-  getItemProjectId,
-  ThreadTreeItemRow,
-  ThreadTreeNodeRow,
-} from "./ProjectRow";
+import { ThreadTreeNodeRow } from "./ProjectRow";
 import { useSidebarSortable } from "./sortableMotion";
 import { useSidebarReorderDnd } from "./useSidebarReorderDnd";
-import type {
-  ProjectThreadItem,
-  ProjectThreadNode,
-} from "./projectThreadGroups";
+import type { ProjectThreadNode } from "./projectThreadGroups";
 import {
   useNeighborReorderSortable,
   type UseNeighborReorderSortableArgs,
@@ -28,10 +20,6 @@ export interface PinnedThreadRootReorderCallbacks {
 
 export interface PinnedThreadTreeProps {
   rootNodes: readonly ProjectThreadNode[];
-  // Folder-aware render list. When it contains folders (Group by: Folder), the
-  // pinned section renders them as a static tree; otherwise it keeps the
-  // existing sortable flat list (pinned reorder via pinSortKey).
-  rootItems: readonly ProjectThreadItem[];
   selectedThreadId?: string;
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
@@ -56,8 +44,10 @@ interface SortablePinnedRootItemProps {
   selectedThreadId?: string;
 }
 
-interface PinnedRootItemProps
-  extends Omit<SortablePinnedRootItemProps, "disabled"> {
+interface PinnedRootItemProps extends Omit<
+  SortablePinnedRootItemProps,
+  "disabled"
+> {
   consumeClickSuppression?: () => boolean;
 }
 
@@ -130,7 +120,6 @@ const SortablePinnedRootItem = memo(function SortablePinnedRootItem({
 
 export const PinnedThreadTree = memo(function PinnedThreadTree({
   rootNodes,
-  rootItems,
   selectedThreadId,
   collapsedThreadIds,
   collapsedEnvironmentIds,
@@ -140,9 +129,6 @@ export const PinnedThreadTree = memo(function PinnedThreadTree({
   isPinnedReorderPending = false,
   onReorderPinnedRoot,
 }: PinnedThreadTreeProps) {
-  // Drag-reorder (pinSortKey) and derived folders don't compose — a folder has
-  // no sort key — so when folders are actually present we render a static tree.
-  const hasFolders = rootItems.some((item) => item.kind === "folder");
   const handleReorderPinnedRoot = useCallback<
     UseNeighborReorderSortableArgs<ProjectThreadNode>["onReorder"]
   >(
@@ -166,31 +152,6 @@ export const PinnedThreadTree = memo(function PinnedThreadTree({
   const { dndContextProps, consumeClickSuppression, onClickCapture } =
     useSidebarReorderDnd({ onDragEnd: handleSortableDragEnd });
 
-  if (hasFolders) {
-    return (
-      <div
-        data-sidebar-sticky-section=""
-        className="relative space-y-0.5 group-data-[collapsible=icon]:hidden"
-      >
-        {rootItems.map((item) => (
-          <ThreadTreeItemRow
-            key={getItemKey(item)}
-            projectId={getItemProjectId(item)}
-            item={item}
-            depthOffset={0}
-            selectedThreadId={selectedThreadId}
-            collapsedThreadIds={collapsedThreadIds}
-            collapsedEnvironmentIds={collapsedEnvironmentIds}
-            variant="section"
-            onProjectSelect={onProjectSelect}
-            onToggleThreadCollapsed={onToggleThreadCollapsed}
-            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-          />
-        ))}
-      </div>
-    );
-  }
-
   if (renderedRootNodes.length === 0) {
     return null;
   }
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 858d803db..7ada141df 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -102,10 +102,7 @@ import {
   type SidebarSectionId,
 } from "./sidebarCollapsedAtoms";
 import { folderAncestorKeys } from "./folderPath";
-import {
-  CHRONOLOGICAL_CONTAINER_ID,
-  PINNED_CONTAINER_ID,
-} from "./projectThreadGroups";
+import { CHRONOLOGICAL_CONTAINER_ID } from "./projectThreadGroups";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -1234,9 +1231,6 @@ function ProjectListComponent({
     sidebarChronologicalSortAtom,
   );
   const isFolderOrganizationMode = organizationMode === "chronological";
-  const groupBy = isFolderOrganizationMode
-    ? ("folder" as const)
-    : ("none" as const);
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
@@ -1300,8 +1294,8 @@ function ProjectListComponent({
     }
   }, [chronologicalSort, setChronologicalSort]);
   const pinnedSidebarState = useMemo(
-    () => buildPinnedSidebarState({ threads, groupBy }),
-    [threads, groupBy],
+    () => buildPinnedSidebarState({ threads }),
+    [threads],
   );
   const hasPinnedSection = pinnedSidebarState.rootNodes.length > 0;
   const visibleSidebarSectionOrder = useMemo(
@@ -1359,12 +1353,12 @@ function ProjectListComponent({
     // cross-project Folders view.
     const isPinned =
       pinnedSidebarState.effectivePinnedThreadIds.has(selectedThreadId);
-    if (isFolderOrganizationMode) {
-      const folderContainerId = isPinned
-        ? PINNED_CONTAINER_ID
-        : CHRONOLOGICAL_CONTAINER_ID;
+    if (isFolderOrganizationMode && !isPinned) {
       const folderKeysToExpand = new Set(
-        folderAncestorKeys(folderContainerId, selectedThread.folderPath),
+        folderAncestorKeys(
+          CHRONOLOGICAL_CONTAINER_ID,
+          selectedThread.folderPath,
+        ),
       );
       if (folderKeysToExpand.size > 0) {
         setCollapsedFolderList((current) =>
@@ -1569,7 +1563,6 @@ function ProjectListComponent({
   const pinnedSectionContent = (
     <PinnedThreadTree
       rootNodes={pinnedSidebarState.rootNodes}
-      rootItems={pinnedSidebarState.rootItems}
       selectedThreadId={selectedThreadId}
       collapsedThreadIds={collapsedThreadIds}
       collapsedEnvironmentIds={collapsedEnvironmentIds}
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
index 135b8b05a..5d878f9ce 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.test.ts
@@ -185,38 +185,7 @@ describe("buildPinnedSidebarState", () => {
     expect(state.rootNodes[0]?.stats.childCount).toBe(1);
   });
 
-  it("folds pinned roots into folders ordered by the pinned comparator", () => {
-    const state = buildPinnedSidebarState({
-      threads: [
-        // Work's pinned thread sorts after Personal's by pinSortKey, so
-        // Personal's folder must render first under the pinned (not sidebar)
-        // ordering.
-        createThread({
-          id: "a",
-          title: "Alpha",
-          folderPath: "Work",
-          pinnedAt: 1_000,
-          pinSortKey: "b",
-        }),
-        createThread({
-          id: "b",
-          title: "Beta",
-          folderPath: "Personal",
-          pinnedAt: 1_000,
-          pinSortKey: "a",
-        }),
-      ],
-      groupBy: "folder",
-    });
-
-    expect(
-      state.rootItems.map((item) =>
-        item.kind === "folder" ? item.group.key : "thread",
-      ),
-    ).toEqual(["pinned::Personal", "pinned::Work"]);
-  });
-
-  it("keeps a flat thread list under Group by: None", () => {
+  it("keeps pinned roots flat even when they have folder paths", () => {
     const state = buildPinnedSidebarState({
       threads: [
         createThread({
@@ -227,9 +196,8 @@ describe("buildPinnedSidebarState", () => {
           pinSortKey: "a",
         }),
       ],
-      groupBy: "none",
     });
 
-    expect(state.rootItems.every((item) => item.kind === "thread")).toBe(true);
+    expect(rootIds(state)).toEqual(["a"]);
   });
 });
diff --git a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
index 87a241a6f..9c513daa4 100644
--- a/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
+++ b/apps/app/src/components/sidebar/pinnedSidebarThreads.ts
@@ -1,25 +1,18 @@
 import type { ThreadListEntry } from "@bb/domain";
 import { compareCodepoint } from "@/lib/codepoint-compare";
 import {
-  bucketIntoFolders,
   buildProjectThreadGroups,
-  PINNED_CONTAINER_ID,
   type ProjectThreadItem,
   type ProjectThreadNode,
 } from "./projectThreadGroups";
-import type { SidebarGroupBy } from "./sidebarCollapsedAtoms";
 
 export interface PinnedSidebarState {
   effectivePinnedThreadIds: Set<string>;
   rootNodes: ProjectThreadNode[];
-  // Folder-aware render list: flat thread items under Group by: None, folded
-  // by stored folderPath (ordered by comparePinnedRoots) under Group by: Folder.
-  rootItems: ProjectThreadItem[];
 }
 
 interface BuildPinnedSidebarStateArgs {
   threads: readonly ThreadListEntry[];
-  groupBy?: SidebarGroupBy;
 }
 
 function compareByPinnedFallback(
@@ -99,7 +92,6 @@ function collectRootNodes(
 
 export function buildPinnedSidebarState({
   threads,
-  groupBy,
 }: BuildPinnedSidebarStateArgs): PinnedSidebarState {
   const explicitlyPinnedThreads = threads.filter(
     (thread) => thread.pinnedAt !== null,
@@ -138,24 +130,8 @@ export function buildPinnedSidebarState({
     comparePinnedRoots(left.thread, right.thread),
   );
 
-  // Pinned has its own root order (pinSortKey via comparePinnedRoots), never the
-  // sidebar sort. Fold into folders using that same comparator so folders order
-  // by their representative pinned descendant; Group by: None keeps the flat list.
-  const sortedThreadItems = rootNodes.map(
-    (node): ProjectThreadItem => ({ kind: "thread", node }),
-  );
-  const rootItems =
-    groupBy === "folder"
-      ? bucketIntoFolders(
-          sortedThreadItems,
-          PINNED_CONTAINER_ID,
-          (left, right) => comparePinnedRoots(left, right),
-        )
-      : sortedThreadItems;
-
   return {
     effectivePinnedThreadIds,
     rootNodes,
-    rootItems,
   };
 }

From cdce06619433950923111a5d75ad2c141e9c9a70 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:31:27 -0700
Subject: [PATCH 17/54] Reuse project icons for thread folders

---
 apps/app/src/components/sidebar/SidebarFolderRow.tsx | 2 +-
 apps/app/src/components/ui/icon.tsx                  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index a15189e86..c5d1f0b12 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -110,7 +110,7 @@ function SidebarFolderRowComponent({
         aria-hidden="true"
       >
         <Icon
-          name="FolderTree"
+          name={isCollapsed ? "Folder" : "FolderOpen"}
           className={COARSE_POINTER_ICON_SIZE_CLASS}
           aria-hidden="true"
         />
diff --git a/apps/app/src/components/ui/icon.tsx b/apps/app/src/components/ui/icon.tsx
index 9bd2b14af..14ecfa0e7 100644
--- a/apps/app/src/components/ui/icon.tsx
+++ b/apps/app/src/components/ui/icon.tsx
@@ -51,7 +51,6 @@ import {
   FolderGitTwoIcon,
   FolderIcon,
   FolderRemoveIcon,
-  FolderTreeIcon,
   GitBranchIcon,
   GitMergeIcon,
   GitPullRequestArrow,
@@ -149,7 +148,6 @@ const ICON_MAP = {
   FolderOpen: Folder02Icon,
   FolderMinus: FolderRemoveIcon,
   FolderPlus: FolderAddIcon,
-  FolderTree: FolderTreeIcon,
   Fork: TrendingUpDownIcon,
   GitBranch: GitBranchIcon,
   GitMerge: GitMergeIcon,

From a66b5452bddc340e873a57799b199434dd843e0e Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:37:03 -0700
Subject: [PATCH 18/54] Add sidebar row action tooltips

---
 .../components/project/ProjectActionsMenu.tsx |  51 +++---
 .../src/components/sidebar/ProjectList.tsx    | 161 +++++++++++-------
 .../app/src/components/sidebar/ProjectRow.tsx | 116 ++++++++-----
 3 files changed, 204 insertions(+), 124 deletions(-)

diff --git a/apps/app/src/components/project/ProjectActionsMenu.tsx b/apps/app/src/components/project/ProjectActionsMenu.tsx
index a371a8f28..822923e5f 100644
--- a/apps/app/src/components/project/ProjectActionsMenu.tsx
+++ b/apps/app/src/components/project/ProjectActionsMenu.tsx
@@ -19,6 +19,11 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu.js";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip.js";
 import { usePathPickerHost } from "@/hooks/useLocalPathPicker";
 import {
   getProjectArchivedRoutePath,
@@ -169,25 +174,33 @@ export function ProjectActionsMenu({
 }: ProjectActionsMenuProps) {
   return (
     <DropdownMenu onOpenChange={onOpenChange}>
-      <DropdownMenuTrigger asChild>
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon"
-          className={cn(
-            "rounded-md p-0 text-muted-foreground",
-            triggerClassName,
-            "data-[state=open]:bg-state-active data-[state=open]:text-foreground",
-          )}
-          aria-label={`${project.name} actions`}
-          title={`${project.name} actions`}
-          onClick={(event) => {
-            event.stopPropagation();
-          }}
-        >
-          <Icon name="MoreHorizontal" className={COARSE_POINTER_ICON_SIZE_CLASS} />
-        </Button>
-      </DropdownMenuTrigger>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <DropdownMenuTrigger asChild>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              className={cn(
+                "rounded-md p-0 text-muted-foreground",
+                triggerClassName,
+                "data-[state=open]:bg-state-active data-[state=open]:text-foreground",
+              )}
+              aria-label={`${project.name} actions`}
+              title={undefined}
+              onClick={(event) => {
+                event.stopPropagation();
+              }}
+            >
+              <Icon
+                name="MoreHorizontal"
+                className={COARSE_POINTER_ICON_SIZE_CLASS}
+              />
+            </Button>
+          </DropdownMenuTrigger>
+        </TooltipTrigger>
+        <TooltipContent side="top">Project actions</TooltipContent>
+      </Tooltip>
       <DropdownMenuContent align={align} className="w-44">
         <ProjectActionsMenuItems project={project} surface="dropdown" />
       </DropdownMenuContent>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 7ada141df..a2c4481df 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -111,6 +111,11 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip.js";
 import {
   SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
@@ -417,12 +422,12 @@ function ProjectListSectionIconButton({
     [onClick],
   );
 
-  return (
+  const button = (
     <Button
       type="button"
       size="icon"
       variant="ghost"
-      title={title}
+      title={undefined}
       aria-label={ariaLabel}
       disabled={disabled}
       className={PROJECT_LIST_SECTION_ACTION_BUTTON_CLASS}
@@ -431,6 +436,15 @@ function ProjectListSectionIconButton({
       <Icon name={iconName} className={COARSE_POINTER_ICON_SIZE_CLASS} />
     </Button>
   );
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        {disabled ? <span className="inline-flex">{button}</span> : button}
+      </TooltipTrigger>
+      <TooltipContent side="top">{title}</TooltipContent>
+    </Tooltip>
+  );
 }
 
 function ProjectListProjectsSectionActions({
@@ -543,22 +557,27 @@ export function SidebarViewOptionsMenu({
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
-      <DropdownMenuTrigger asChild>
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon"
-          aria-label="Sidebar display options"
-          title="Sidebar display options"
-          className={cn(
-            "rounded-md p-0 text-muted-foreground",
-            "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
-            COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-          )}
-        >
-          <Icon name="Sort" className={COARSE_POINTER_ICON_SIZE_CLASS} />
-        </Button>
-      </DropdownMenuTrigger>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <DropdownMenuTrigger asChild>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              aria-label="Sidebar display options"
+              title={undefined}
+              className={cn(
+                "rounded-md p-0 text-muted-foreground",
+                "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
+                COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+              )}
+            >
+              <Icon name="Sort" className={COARSE_POINTER_ICON_SIZE_CLASS} />
+            </Button>
+          </DropdownMenuTrigger>
+        </TooltipTrigger>
+        <TooltipContent side="top">Sidebar display options</TooltipContent>
+      </Tooltip>
       <DropdownMenuContent
         align="end"
         className="w-52"
@@ -621,25 +640,30 @@ function SidebarThreadActionsMenu({
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
-      <DropdownMenuTrigger asChild>
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon"
-          aria-label="Threads actions"
-          title="Threads actions"
-          className={cn(
-            "rounded-md p-0 text-muted-foreground",
-            "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
-            COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-          )}
-        >
-          <Icon
-            name="MoreHorizontal"
-            className={COARSE_POINTER_ICON_SIZE_CLASS}
-          />
-        </Button>
-      </DropdownMenuTrigger>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <DropdownMenuTrigger asChild>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              aria-label="Threads actions"
+              title={undefined}
+              className={cn(
+                "rounded-md p-0 text-muted-foreground",
+                "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
+                COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+              )}
+            >
+              <Icon
+                name="MoreHorizontal"
+                className={COARSE_POINTER_ICON_SIZE_CLASS}
+              />
+            </Button>
+          </DropdownMenuTrigger>
+        </TooltipTrigger>
+        <TooltipContent side="top">Threads actions</TooltipContent>
+      </Tooltip>
       <DropdownMenuContent
         align="end"
         className="w-44"
@@ -774,36 +798,41 @@ function TopLevelSidebarSection({
           {/* Reserve room for up to four section action buttons on the right;
               coarse pointers need a little more. */}
           {collapseControl ? (
-            <button
-              type="button"
-              aria-expanded={!collapseControl.isCollapsed}
-              aria-label={
-                collapseControl.isCollapsed
-                  ? `Expand ${label} section`
-                  : `Collapse ${label} section`
-              }
-              title={
-                collapseControl.isCollapsed
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <button
+                  type="button"
+                  aria-expanded={!collapseControl.isCollapsed}
+                  aria-label={
+                    collapseControl.isCollapsed
+                      ? `Expand ${label} section`
+                      : `Collapse ${label} section`
+                  }
+                  title={undefined}
+                  className={cn(
+                    !collapseControl.isCollapsed && SIDEBAR_HOVER_ACTIONS_CLASS,
+                    "relative z-20 inline-flex size-5 shrink-0 items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:text-sidebar-foreground focus-visible:ring-2",
+                  )}
+                  onClick={handleCollapseControlClick}
+                  onPointerDown={stopCollapseControlPointerDown}
+                  onKeyDown={stopCollapseControlKeyDown}
+                >
+                  <Icon
+                    name="ChevronRight"
+                    className={cn(
+                      "size-3 transition-transform duration-150",
+                      !collapseControl.isCollapsed && "rotate-90",
+                    )}
+                    aria-hidden="true"
+                  />
+                </button>
+              </TooltipTrigger>
+              <TooltipContent side="top">
+                {collapseControl.isCollapsed
                   ? `Expand ${label}`
-                  : `Collapse ${label}`
-              }
-              className={cn(
-                !collapseControl.isCollapsed && SIDEBAR_HOVER_ACTIONS_CLASS,
-                "relative z-20 inline-flex size-5 shrink-0 items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:text-sidebar-foreground focus-visible:ring-2",
-              )}
-              onClick={handleCollapseControlClick}
-              onPointerDown={stopCollapseControlPointerDown}
-              onKeyDown={stopCollapseControlKeyDown}
-            >
-              <Icon
-                name="ChevronRight"
-                className={cn(
-                  "size-3 transition-transform duration-150",
-                  !collapseControl.isCollapsed && "rotate-90",
-                )}
-                aria-hidden="true"
-              />
-            </button>
+                  : `Collapse ${label}`}
+              </TooltipContent>
+            </Tooltip>
           ) : null}
         </span>
         {actions ? (
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index dc59dd226..fb23aa277 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -39,6 +39,11 @@ import {
   SidebarStickyGroup,
   SidebarStickyTier,
 } from "@/components/ui/sidebar.js";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip.js";
 import {
   ProjectActionsContextMenu,
   ProjectActionsMenu,
@@ -1747,24 +1752,30 @@ function ProjectRowComponent({
               />
             </span>
             {isLocalPathInvalid ? (
-              <NavLink
-                to={getProjectSettingsRoutePath(project.id)}
-                onClick={(event) => {
-                  event.stopPropagation();
-                  onProjectSelect?.();
-                }}
-                title="Project folder not found. Open project settings to fix."
-                aria-label="Project folder not found"
-                className={cn(
-                  "relative z-10 inline-flex shrink-0 items-center justify-center rounded-md text-destructive outline-none ring-sidebar-ring transition-colors hover:bg-destructive/10 hover:text-destructive focus-visible:ring-2",
-                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                )}
-              >
-                <Icon
-                  name="AlertTriangle"
-                  className={COARSE_POINTER_ICON_SIZE_CLASS}
-                />
-              </NavLink>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <NavLink
+                    to={getProjectSettingsRoutePath(project.id)}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      onProjectSelect?.();
+                    }}
+                    aria-label="Project folder not found"
+                    className={cn(
+                      "relative z-10 inline-flex shrink-0 items-center justify-center rounded-md text-destructive outline-none ring-sidebar-ring transition-colors hover:bg-destructive/10 hover:text-destructive focus-visible:ring-2",
+                      COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                    )}
+                  >
+                    <Icon
+                      name="AlertTriangle"
+                      className={COARSE_POINTER_ICON_SIZE_CLASS}
+                    />
+                  </NavLink>
+                </TooltipTrigger>
+                <TooltipContent side="top">
+                  Open project settings to fix folder
+                </TooltipContent>
+              </Tooltip>
             ) : null}
             <span
               data-sidebar-hover-actions-open={
@@ -1787,27 +1798,54 @@ function ProjectRowComponent({
                   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
                 )}
               />
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon"
-                aria-label={`New thread in ${project.name}`}
-                title="New thread"
-                disabled={!onCreateProjectThread}
-                onClick={(event) => {
-                  event.stopPropagation();
-                  handleCreateThread();
-                }}
-                className={cn(
-                  "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                )}
-              >
-                <Icon
-                  name="MessageSquarePlus"
-                  className={COARSE_POINTER_ICON_SIZE_CLASS}
-                />
-              </Button>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  {onCreateProjectThread ? (
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="icon"
+                      aria-label={`New thread in ${project.name}`}
+                      title={undefined}
+                      disabled={!onCreateProjectThread}
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        handleCreateThread();
+                      }}
+                      className={cn(
+                        "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                        COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                      )}
+                    >
+                      <Icon
+                        name="MessageSquarePlus"
+                        className={COARSE_POINTER_ICON_SIZE_CLASS}
+                      />
+                    </Button>
+                  ) : (
+                    <span className="inline-flex">
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="icon"
+                        aria-label={`New thread in ${project.name}`}
+                        title={undefined}
+                        disabled
+                        className={cn(
+                          "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                          COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                        )}
+                      >
+                        <Icon
+                          name="MessageSquarePlus"
+                          className={COARSE_POINTER_ICON_SIZE_CLASS}
+                        />
+                      </Button>
+                    </span>
+                  )}
+                </TooltipTrigger>
+                <TooltipContent side="top">New thread</TooltipContent>
+              </Tooltip>
             </span>
           </SidebarStickyTier>
         </ProjectActionsContextMenu>

From 240e38cce7f26f04dda467ad8157ec73e8519c0d Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:42:25 -0700
Subject: [PATCH 19/54] Remove folder shortcut from thread rename

---
 .../dialogs/ThreadRenameDialog.stories.tsx    |  6 +--
 .../components/dialogs/ThreadRenameDialog.tsx | 19 +------
 .../src/components/sidebar/folderPath.test.ts | 49 -------------------
 apps/app/src/components/sidebar/folderPath.ts | 25 +---------
 4 files changed, 6 insertions(+), 93 deletions(-)

diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
index db0fee1e7..a23f13900 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.stories.tsx
@@ -22,7 +22,7 @@ const parentTarget: ThreadRenameDialogTarget = {
   currentTitle: "Frontend Parent",
 };
 
-const folderTarget: ThreadRenameDialogTarget = {
+const slashTitleTarget: ThreadRenameDialogTarget = {
   id: "thr_folder",
   currentTitle: "test/say hi",
 };
@@ -60,10 +60,10 @@ export function Overview() {
           />
         </DialogStage>
       </StoryRow>
-      <StoryRow label="folder path" hint="slash title creates a folder">
+      <StoryRow label="slash title" hint="slashes stay part of the title">
         <DialogStage>
           <ThreadRenameDialogContent
-            target={folderTarget}
+            target={slashTitleTarget}
             pending={false}
             onRename={noop}
             inputRef={inputRef}
diff --git a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
index ad9025dcf..3c9ca250f 100644
--- a/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadRenameDialog.tsx
@@ -10,10 +10,6 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog.js";
 import { Input } from "@/components/ui/input.js";
-import {
-  parseThreadFolderShortcut,
-  titleCreatesFolder,
-} from "@/components/sidebar/folderPath";
 import { useNameValidation } from "./useNameValidation.js";
 import { useRenameDialogAutoFocus } from "./useRenameDialogAutoFocus.js";
 
@@ -24,7 +20,6 @@ export interface ThreadRenameDialogTarget {
 
 export interface ThreadRenameDialogPayload {
   title: string;
-  folderPath?: string | null;
 }
 
 interface ThreadRenameDialogProps {
@@ -77,7 +72,6 @@ export function ThreadRenameDialogContent({
   const { validationMessage, validate, clearMessage } = useNameValidation({
     emptyMessage: `${capitalize(label)} name cannot be empty.`,
   });
-  const createsFolder = titleCreatesFolder(nextTitle);
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
@@ -86,11 +80,7 @@ export function ThreadRenameDialogContent({
     const trimmedTitle = validate(nextTitle);
     if (trimmedTitle === null) return;
 
-    const folderShortcut = parseThreadFolderShortcut(trimmedTitle);
-    onRename(
-      target.id,
-      folderShortcut.folderPath ? folderShortcut : { title: trimmedTitle },
-    );
+    onRename(target.id, { title: trimmedTitle });
   };
 
   return (
@@ -120,15 +110,10 @@ export function ThreadRenameDialogContent({
           {validationMessage ? (
             <p className="text-sm text-destructive">{validationMessage}</p>
           ) : null}
-          {createsFolder ? (
-            <p className="text-sm text-muted-foreground">
-              Using “/” groups this thread into a folder
-            </p>
-          ) : null}
         </div>
         <DialogFooter>
           <Button type="submit" disabled={pending}>
-            {createsFolder ? "Create folder & rename" : `Rename ${label}`}
+            Rename {label}
           </Button>
         </DialogFooter>
       </form>
diff --git a/apps/app/src/components/sidebar/folderPath.test.ts b/apps/app/src/components/sidebar/folderPath.test.ts
index 86bcd2141..13bc545f4 100644
--- a/apps/app/src/components/sidebar/folderPath.test.ts
+++ b/apps/app/src/components/sidebar/folderPath.test.ts
@@ -3,9 +3,7 @@ import {
   buildFolderKey,
   folderAncestorKeys,
   normalizeFolderPath,
-  parseThreadFolderShortcut,
   splitFolderPath,
-  titleCreatesFolder,
 } from "./folderPath";
 
 describe("splitFolderPath", () => {
@@ -34,53 +32,6 @@ describe("normalizeFolderPath", () => {
   });
 });
 
-describe("parseThreadFolderShortcut", () => {
-  it("splits an explicit slash rename into folderPath and title", () => {
-    expect(parseThreadFolderShortcut("Work/Q3/Plan")).toEqual({
-      folderPath: "Work/Q3",
-      title: "Plan",
-    });
-  });
-
-  it("keeps slashy titles literal when they do not define a folder and leaf", () => {
-    expect(parseThreadFolderShortcut("Standalone")).toEqual({
-      folderPath: null,
-      title: "Standalone",
-    });
-    expect(parseThreadFolderShortcut("Work/")).toEqual({
-      folderPath: null,
-      title: "Work/",
-    });
-  });
-
-  it("collapses leading, trailing, and doubled slashes in explicit paths", () => {
-    expect(parseThreadFolderShortcut("/Work//Q3/Plan/")).toEqual({
-      folderPath: "Work/Q3",
-      title: "Plan",
-    });
-  });
-});
-
-describe("titleCreatesFolder", () => {
-  it("is false for a single segment", () => {
-    expect(titleCreatesFolder("Standalone")).toBe(false);
-  });
-
-  it("is false when a trailing slash leaves a single segment", () => {
-    expect(titleCreatesFolder("Work/")).toBe(false);
-  });
-
-  it("is false for an all-slashes title", () => {
-    expect(titleCreatesFolder("///")).toBe(false);
-  });
-
-  it("is true once two or more segments survive normalization", () => {
-    expect(titleCreatesFolder("Work/Q3")).toBe(true);
-    expect(titleCreatesFolder("Work/Q3/")).toBe(true);
-    expect(titleCreatesFolder("Clients/Acme/Onboarding")).toBe(true);
-  });
-});
-
 describe("buildFolderKey", () => {
   it("namespaces a folder path by its container id", () => {
     expect(buildFolderKey("proj_bb", ["Work", "Q3"])).toBe("proj_bb::Work/Q3");
diff --git a/apps/app/src/components/sidebar/folderPath.ts b/apps/app/src/components/sidebar/folderPath.ts
index 0549c9830..b0e637111 100644
--- a/apps/app/src/components/sidebar/folderPath.ts
+++ b/apps/app/src/components/sidebar/folderPath.ts
@@ -1,13 +1,5 @@
 // Pure helpers for sidebar folders. Thread titles are display text; folder
-// membership lives in `thread.folderPath`. Slash parsing is only used by
-// explicit UI affordances that choose to write folder metadata.
-
-export interface ThreadFolderShortcut {
-  /** Normalized folder path written to thread.folderPath, or null for none. */
-  folderPath: string | null;
-  /** Thread title written separately from the folder path. */
-  title: string;
-}
+// membership lives in `thread.folderPath`.
 
 function splitPathSegments(value: string): string[] {
   return value
@@ -32,21 +24,6 @@ export function normalizeFolderPath(
   return normalized.length > 0 ? normalized : null;
 }
 
-export function parseThreadFolderShortcut(value: string): ThreadFolderShortcut {
-  const segments = splitPathSegments(value);
-  if (segments.length <= 1) {
-    return { folderPath: null, title: value.trim() };
-  }
-  return {
-    folderPath: segments.slice(0, -1).join("/"),
-    title: segments[segments.length - 1],
-  };
-}
-
-export function titleCreatesFolder(value: string): boolean {
-  return parseThreadFolderShortcut(value).folderPath !== null;
-}
-
 // Every ancestor folder key for a stored folder path, outermost first — e.g.
 // "Work/Q3" in container "p" → ["p::Work", "p::Work/Q3"]. Used to un-collapse
 // the folders hiding a selected thread.

From cda69415ec55b50ffd67ba0b3f42587e221c553e Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 01:45:20 -0700
Subject: [PATCH 20/54] Show sidebar action tooltips below buttons

---
 apps/app/src/components/project/ProjectActionsMenu.tsx | 2 +-
 apps/app/src/components/sidebar/ProjectList.tsx        | 8 ++++----
 apps/app/src/components/sidebar/ProjectRow.tsx         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/app/src/components/project/ProjectActionsMenu.tsx b/apps/app/src/components/project/ProjectActionsMenu.tsx
index 822923e5f..332b208f2 100644
--- a/apps/app/src/components/project/ProjectActionsMenu.tsx
+++ b/apps/app/src/components/project/ProjectActionsMenu.tsx
@@ -199,7 +199,7 @@ export function ProjectActionsMenu({
             </Button>
           </DropdownMenuTrigger>
         </TooltipTrigger>
-        <TooltipContent side="top">Project actions</TooltipContent>
+        <TooltipContent side="bottom">Project actions</TooltipContent>
       </Tooltip>
       <DropdownMenuContent align={align} className="w-44">
         <ProjectActionsMenuItems project={project} surface="dropdown" />
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index a2c4481df..d8b7b401e 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -442,7 +442,7 @@ function ProjectListSectionIconButton({
       <TooltipTrigger asChild>
         {disabled ? <span className="inline-flex">{button}</span> : button}
       </TooltipTrigger>
-      <TooltipContent side="top">{title}</TooltipContent>
+      <TooltipContent side="bottom">{title}</TooltipContent>
     </Tooltip>
   );
 }
@@ -576,7 +576,7 @@ export function SidebarViewOptionsMenu({
             </Button>
           </DropdownMenuTrigger>
         </TooltipTrigger>
-        <TooltipContent side="top">Sidebar display options</TooltipContent>
+        <TooltipContent side="bottom">Sidebar display options</TooltipContent>
       </Tooltip>
       <DropdownMenuContent
         align="end"
@@ -662,7 +662,7 @@ function SidebarThreadActionsMenu({
             </Button>
           </DropdownMenuTrigger>
         </TooltipTrigger>
-        <TooltipContent side="top">Threads actions</TooltipContent>
+        <TooltipContent side="bottom">Threads actions</TooltipContent>
       </Tooltip>
       <DropdownMenuContent
         align="end"
@@ -827,7 +827,7 @@ function TopLevelSidebarSection({
                   />
                 </button>
               </TooltipTrigger>
-              <TooltipContent side="top">
+              <TooltipContent side="bottom">
                 {collapseControl.isCollapsed
                   ? `Expand ${label}`
                   : `Collapse ${label}`}
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index fb23aa277..56e4fcff3 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -1772,7 +1772,7 @@ function ProjectRowComponent({
                     />
                   </NavLink>
                 </TooltipTrigger>
-                <TooltipContent side="top">
+                <TooltipContent side="bottom">
                   Open project settings to fix folder
                 </TooltipContent>
               </Tooltip>
@@ -1844,7 +1844,7 @@ function ProjectRowComponent({
                     </span>
                   )}
                 </TooltipTrigger>
-                <TooltipContent side="top">New thread</TooltipContent>
+                <TooltipContent side="bottom">New thread</TooltipContent>
               </Tooltip>
             </span>
           </SidebarStickyTier>

From 0ed5bd65f7f7764ca445115550f2612a24385aa6 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 02:17:50 -0700
Subject: [PATCH 21/54] Add folder actions and loose threads section

---
 .../dialogs/ThreadFolderCreateDialog.tsx      |  80 +++++-
 .../src/components/sidebar/ProjectList.tsx    | 167 ++++++++++---
 .../app/src/components/sidebar/ProjectRow.tsx | 229 +++++++++++++++++-
 .../components/sidebar/SidebarFolderRow.tsx   |  97 +++++++-
 .../mutations/thread-folder-mutations.ts      |  50 +++-
 apps/app/src/lib/api.ts                       |  19 ++
 apps/app/src/views/RootComposeView.tsx        |  22 ++
 apps/server/src/routes/thread-folders.ts      |  34 ++-
 apps/server/src/routes/threads/base.ts        |   4 +
 .../services/threads/thread-create-helpers.ts |   1 +
 .../services/threads/thread-create-request.ts |   1 +
 packages/db/src/data/index.ts                 |   5 +
 packages/db/src/data/thread-folders.ts        | 184 +++++++++++++-
 packages/db/test/data/threads.test.ts         |  87 +++++++
 packages/server-contract/src/api/projects.ts  |  29 +++
 packages/server-contract/src/api/threads.ts   |   1 +
 packages/server-contract/src/public-api.ts    |  21 ++
 .../server-contract/test/contract.test.ts     |   1 +
 18 files changed, 963 insertions(+), 69 deletions(-)

diff --git a/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx b/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
index 406984e1b..4ffb5643b 100644
--- a/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
+++ b/apps/app/src/components/dialogs/ThreadFolderCreateDialog.tsx
@@ -20,9 +20,25 @@ interface ThreadFolderCreateDialogProps {
   onCreate: (path: string) => void;
 }
 
-interface ThreadFolderCreateDialogContentProps {
+export interface ThreadFolderRenameDialogTarget {
+  path: string;
+}
+
+interface ThreadFolderRenameDialogProps {
+  target: ThreadFolderRenameDialogTarget | null;
+  pending?: boolean;
+  onOpenChange: (open: boolean) => void;
+  onRename: (path: string, newPath: string) => void;
+}
+
+interface ThreadFolderDialogContentProps {
+  description: string;
+  initialPath: string;
+  inputLabel: string;
   pending: boolean;
-  onCreate: (path: string) => void;
+  submitLabel: string;
+  title: string;
+  onSubmit: (path: string) => void;
   inputRef: RefObject<HTMLInputElement | null>;
 }
 
@@ -37,9 +53,42 @@ export function ThreadFolderCreateDialog({
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent onOpenAutoFocus={handleOpenAutoFocus}>
         {open ? (
-          <ThreadFolderCreateDialogContent
+          <ThreadFolderDialogContent
+            description="Create a folder for threads."
+            initialPath=""
+            inputLabel="Folder name"
+            pending={pending}
+            submitLabel="Create folder"
+            title="New folder"
+            onSubmit={onCreate}
+            inputRef={inputRef}
+          />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+export function ThreadFolderRenameDialog({
+  target,
+  pending = false,
+  onOpenChange,
+  onRename,
+}: ThreadFolderRenameDialogProps) {
+  const { inputRef, handleOpenAutoFocus } = useRenameDialogAutoFocus();
+  return (
+    <Dialog open={target !== null} onOpenChange={onOpenChange}>
+      <DialogContent onOpenAutoFocus={handleOpenAutoFocus}>
+        {target ? (
+          <ThreadFolderDialogContent
+            key={target.path}
+            description="Choose a new path for this folder."
+            initialPath={target.path}
+            inputLabel="Folder path"
             pending={pending}
-            onCreate={onCreate}
+            submitLabel="Rename folder"
+            title="Rename folder"
+            onSubmit={(newPath) => onRename(target.path, newPath)}
             inputRef={inputRef}
           />
         ) : null}
@@ -48,13 +97,18 @@ export function ThreadFolderCreateDialog({
   );
 }
 
-function ThreadFolderCreateDialogContent({
+function ThreadFolderDialogContent({
+  description,
+  initialPath,
+  inputLabel,
   pending,
-  onCreate,
+  submitLabel,
+  title,
+  onSubmit,
   inputRef,
-}: ThreadFolderCreateDialogContentProps) {
+}: ThreadFolderDialogContentProps) {
   const inputId = useId();
-  const [path, setPath] = useState("");
+  const [path, setPath] = useState(initialPath);
   const [folderPathMessage, setFolderPathMessage] = useState<string | null>(
     null,
   );
@@ -74,22 +128,22 @@ function ThreadFolderCreateDialogContent({
       return;
     }
 
-    onCreate(normalizedPath);
+    onSubmit(normalizedPath);
   };
   const displayedMessage = validationMessage ?? folderPathMessage;
 
   return (
     <>
       <DialogHeader>
-        <DialogTitle>New folder</DialogTitle>
-        <DialogDescription>Create a folder for threads.</DialogDescription>
+        <DialogTitle>{title}</DialogTitle>
+        <DialogDescription>{description}</DialogDescription>
       </DialogHeader>
       <form className="space-y-4" onSubmit={handleSubmit}>
         <div className="space-y-2">
           <Input
             ref={inputRef}
             id={inputId}
-            aria-label="Folder name"
+            aria-label={inputLabel}
             value={path}
             autoCapitalize="sentences"
             autoCorrect="off"
@@ -107,7 +161,7 @@ function ThreadFolderCreateDialogContent({
         </div>
         <DialogFooter>
           <Button type="submit" disabled={pending}>
-            Create folder
+            {submitLabel}
           </Button>
         </DialogFooter>
       </form>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index d8b7b401e..877aead3a 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -35,12 +35,17 @@ import { stripProjectThreads } from "@/hooks/queries/project-queries";
 import { useSidebarNavigation } from "@/hooks/queries/sidebar-navigation-query";
 import { useReorderProject } from "@/hooks/mutations/project-mutations";
 import { useReorderPinnedThread } from "@/hooks/mutations/thread-state-mutations";
-import { useCreateThreadFolder } from "@/hooks/mutations/thread-folder-mutations";
+import {
+  useCreateThreadFolder,
+  useDeleteThreadFolder,
+  useUpdateThreadFolder,
+} from "@/hooks/mutations/thread-folder-mutations";
 import {
   isLocalPathMissing,
   useLocalPathExistence,
 } from "@/hooks/queries/host-path-queries";
 import { useHostDaemon } from "@/hooks/useHostDaemon";
+import { useDialogState } from "@/hooks/useDialogState";
 import {
   getProjectlessArchivedRoutePath,
   getRootComposeRoutePath,
@@ -52,7 +57,11 @@ import {
 import { useSetRootComposeProjectId } from "@/lib/root-compose-selection";
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button.js";
-import { ThreadFolderCreateDialog } from "@/components/dialogs/ThreadFolderCreateDialog";
+import {
+  ThreadFolderCreateDialog,
+  ThreadFolderRenameDialog,
+  type ThreadFolderRenameDialogTarget,
+} from "@/components/dialogs/ThreadFolderCreateDialog";
 import { CHROME_SECTION_LABEL_CLASS } from "@/components/ui/chromeStyleTokens";
 import { Icon, type IconName } from "@/components/ui/icon.js";
 import { Skeleton } from "@/components/ui/skeleton.js";
@@ -69,7 +78,10 @@ import {
   COARSE_POINTER_ROW_HEIGHT_CLASS,
   COARSE_POINTER_TEXT_SM_CLASS,
 } from "@/components/ui/coarse-pointer-sizing.js";
-import { ChronologicalThreadTree, ProjectThreadTree } from "./ProjectRow";
+import {
+  ChronologicalFolderThreadSections,
+  ProjectThreadTree,
+} from "./ProjectRow";
 import { SidebarThreadSearchPanel } from "./SidebarThreadSearchPanel";
 import type { ProjectThreadListState } from "./ProjectRow";
 import {
@@ -1101,6 +1113,11 @@ function ProjectListComponent({
     isPending: isCreateThreadFolderPending,
     mutate: createThreadFolderMutate,
   } = useCreateThreadFolder();
+  const {
+    isPending: isUpdateThreadFolderPending,
+    mutate: updateThreadFolderMutate,
+  } = useUpdateThreadFolder();
+  const { mutate: deleteThreadFolderMutate } = useDeleteThreadFolder();
   const projectItems = projects ?? EMPTY_PROJECTS;
   const handleReorderProject = useCallback<
     UseNeighborReorderSortableArgs<ProjectResponse>["onReorder"]
@@ -1153,11 +1170,14 @@ function ProjectListComponent({
     [reorderPinnedThreadMutate],
   );
   const openRootComposeForProject = useCallback(
-    (projectId: string) => {
+    (projectId: string, folderPath?: string) => {
       setRootComposeProjectId(projectId);
       onProjectSelect?.();
       navigate(getRootComposeRoutePath(), {
-        state: { focusPrompt: true },
+        state: {
+          focusPrompt: true,
+          ...(folderPath ? { folderPath } : {}),
+        },
       });
     },
     [navigate, onProjectSelect, setRootComposeProjectId],
@@ -1171,9 +1191,16 @@ function ProjectListComponent({
   const handleCreateProjectlessThread = useCallback(() => {
     openRootComposeForProject(PERSONAL_PROJECT_ID);
   }, [openRootComposeForProject]);
+  const handleCreateThreadInFolder = useCallback(
+    (folderPath: string) => {
+      openRootComposeForProject(PERSONAL_PROJECT_ID, folderPath);
+    },
+    [openRootComposeForProject],
+  );
   const [folderCreateTarget, setFolderCreateTarget] = useState<{
     projectId: string | null;
   } | null>(null);
+  const folderRenameDialog = useDialogState<ThreadFolderRenameDialogTarget>();
   const isFolderCreateDialogOpen = folderCreateTarget !== null;
   const handleOpenCreateFolderDialog = useCallback(() => {
     setFolderCreateTarget({ projectId: null });
@@ -1194,6 +1221,27 @@ function ProjectListComponent({
     },
     [createThreadFolderMutate, folderCreateTarget],
   );
+  const handleOpenRenameThreadFolder = useCallback(
+    (path: string) => {
+      folderRenameDialog.onOpen({ path });
+    },
+    [folderRenameDialog],
+  );
+  const handleRenameThreadFolder = useCallback(
+    (path: string, newPath: string) => {
+      updateThreadFolderMutate(
+        { path, newPath },
+        { onSuccess: () => folderRenameDialog.onClose() },
+      );
+    },
+    [folderRenameDialog, updateThreadFolderMutate],
+  );
+  const handleRemoveThreadFolder = useCallback(
+    (path: string) => {
+      deleteThreadFolderMutate({ path });
+    },
+    [deleteThreadFolderMutate],
+  );
   const handleOpenProjectlessArchivedThreads = useCallback(() => {
     onProjectSelect?.();
     navigate(getProjectlessArchivedRoutePath());
@@ -1633,19 +1681,6 @@ function ProjectListComponent({
       onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
     />
   );
-  const allThreadsSectionContent = (
-    <ChronologicalThreadTree
-      threadListState={allThreadsListState}
-      compareThreads={sidebarThreadComparator}
-      folderPaths={chronologicalFolderPaths}
-      selectedThreadId={selectedThreadId}
-      collapsedThreadIds={collapsedThreadIds}
-      collapsedEnvironmentIds={collapsedEnvironmentIds}
-      onProjectSelect={onProjectSelect}
-      onToggleThreadCollapsed={toggleThreadCollapsed}
-      onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
-    />
-  );
   const projectsSectionActions = (
     <>
       <SidebarViewOptionsMenu
@@ -1665,6 +1700,34 @@ function ProjectListComponent({
   );
   const projectsSectionActionsAlwaysVisible =
     projectsState.status === "ready" && renderedProjects.length === 0;
+  const folderSectionActions = (
+    <>
+      <SidebarViewOptionsMenu
+        open={isThreadsViewOptionsMenuOpen}
+        onOpenChange={handleThreadsViewOptionsMenuOpenChange}
+      />
+      <ProjectListSectionIconButton
+        ariaLabel="New folder"
+        title="New folder"
+        disabled={isCreateThreadFolderPending}
+        iconName="FolderPlus"
+        onClick={handleOpenCreateFolderDialog}
+      />
+    </>
+  );
+  const folderModeThreadsSectionActions = (
+    <>
+      <SidebarThreadActionsMenu
+        open={isThreadsActionsMenuOpen}
+        onOpenChange={handleThreadsActionsMenuOpenChange}
+        onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
+      />
+      <ProjectListThreadsSectionActions
+        isCreatingFolder={isCreateThreadFolderPending}
+        onNewThread={handleCreateProjectlessThread}
+      />
+    </>
+  );
   const threadsSectionActions = (
     <>
       <SidebarThreadActionsMenu
@@ -1678,13 +1741,50 @@ function ProjectListComponent({
       />
       <ProjectListThreadsSectionActions
         isCreatingFolder={isCreateThreadFolderPending}
-        onNewFolder={
-          isFolderOrganizationMode ? handleOpenCreateFolderDialog : undefined
-        }
         onNewThread={handleCreateProjectlessThread}
       />
     </>
   );
+  const folderModeSectionsContent = (
+    <ChronologicalFolderThreadSections
+      threadListState={allThreadsListState}
+      compareThreads={sidebarThreadComparator}
+      folderPaths={chronologicalFolderPaths}
+      selectedThreadId={selectedThreadId}
+      collapsedThreadIds={collapsedThreadIds}
+      collapsedEnvironmentIds={collapsedEnvironmentIds}
+      onProjectSelect={onProjectSelect}
+      onCreateThreadInFolder={handleCreateThreadInFolder}
+      onRenameFolder={handleOpenRenameThreadFolder}
+      onRemoveFolder={handleRemoveThreadFolder}
+      onToggleThreadCollapsed={toggleThreadCollapsed}
+      onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
+      renderFoldersSection={(content) => (
+        <TopLevelSidebarSection
+          label="Folders"
+          actions={folderSectionActions}
+          actionsOpen={isThreadsViewOptionsMenuOpen}
+          actionsMobileAlways
+        >
+          {content}
+        </TopLevelSidebarSection>
+      )}
+      renderThreadsSection={(content) => (
+        <TopLevelSidebarSection
+          label="Threads"
+          actions={folderModeThreadsSectionActions}
+          actionsOpen={isThreadsActionsMenuOpen}
+          actionsMobileAlways
+          collapseControl={{
+            isCollapsed: collapsedSidebarSectionIds.has("threads"),
+            onToggleCollapsed: () => toggleSidebarSectionCollapsed("threads"),
+          }}
+        >
+          {content}
+        </TopLevelSidebarSection>
+      )}
+    />
+  );
   const folderCreateDialog = (
     <ThreadFolderCreateDialog
       open={isFolderCreateDialogOpen}
@@ -1693,6 +1793,14 @@ function ProjectListComponent({
       onCreate={handleCreateThreadFolder}
     />
   );
+  const folderRenameDialogContent = (
+    <ThreadFolderRenameDialog
+      target={folderRenameDialog.target}
+      pending={isUpdateThreadFolderPending}
+      onOpenChange={folderRenameDialog.onOpenChange}
+      onRename={handleRenameThreadFolder}
+    />
+  );
 
   if (threadSearch?.isActive) {
     return (
@@ -1728,22 +1836,10 @@ function ProjectListComponent({
               {pinnedSectionContent}
             </TopLevelSidebarSection>
           ) : null}
-          <TopLevelSidebarSection
-            label="Folders"
-            actions={threadsSectionActions}
-            actionsOpen={
-              isThreadsActionsMenuOpen || isThreadsViewOptionsMenuOpen
-            }
-            actionsMobileAlways
-            collapseControl={{
-              isCollapsed: collapsedSidebarSectionIds.has("threads"),
-              onToggleCollapsed: () => toggleSidebarSectionCollapsed("threads"),
-            }}
-          >
-            {allThreadsSectionContent}
-          </TopLevelSidebarSection>
+          {folderModeSectionsContent}
         </div>
         {folderCreateDialog}
+        {folderRenameDialogContent}
       </ProjectListShell>
     );
   }
@@ -1817,6 +1913,7 @@ function ProjectListComponent({
         </SortableContext>
       </DndContext>
       {folderCreateDialog}
+      {folderRenameDialogContent}
     </ProjectListShell>
   );
 }
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 56e4fcff3..812445b54 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -8,7 +8,7 @@ import {
   type ReactNode,
 } from "react";
 import { useAtomValue, useSetAtom } from "jotai";
-import { DndContext, type DragEndEvent } from "@dnd-kit/core";
+import { DndContext, useDroppable, type DragEndEvent } from "@dnd-kit/core";
 import {
   SortableContext,
   verticalListSortingStrategy,
@@ -172,10 +172,18 @@ export interface ChronologicalThreadTreeProps {
   collapsedThreadIds: Set<string>;
   collapsedEnvironmentIds: Set<string>;
   onProjectSelect?: () => void;
+  onCreateThreadInFolder?: (folderPath: string) => void;
+  onRenameFolder?: (folderPath: string) => void;
+  onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
 }
 
+export interface ChronologicalFolderThreadSectionsProps extends ChronologicalThreadTreeProps {
+  renderFoldersSection: (content: ReactNode) => ReactNode;
+  renderThreadsSection: (content: ReactNode) => ReactNode;
+}
+
 export type ProjectThreadTreeVariant = "project" | "section";
 
 type ProjectItemClickCaptureHandler = MouseEventHandler<HTMLLIElement>;
@@ -224,6 +232,9 @@ interface ThreadTreeItemRowProps {
   collapsedEnvironmentIds: Set<string>;
   variant: ProjectThreadTreeVariant;
   onProjectSelect?: () => void;
+  onCreateThreadInFolder?: (folderPath: string) => void;
+  onRenameFolder?: (folderPath: string) => void;
+  onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
   consumeClickSuppression?: ConsumeDragClickSuppression;
@@ -241,6 +252,9 @@ interface FolderTreeItemRowProps {
   collapsedEnvironmentIds: Set<string>;
   variant: ProjectThreadTreeVariant;
   onProjectSelect?: () => void;
+  onCreateThreadInFolder?: (folderPath: string) => void;
+  onRenameFolder?: (folderPath: string) => void;
+  onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
   consumeClickSuppression?: ConsumeDragClickSuppression;
@@ -386,17 +400,25 @@ function useManualThreadTreeDnd({
       const activeKind = lookup.itemKindById.get(activeId);
       const overKind = lookup.itemKindById.get(overId);
       const fromParentKey = lookup.parentKeyByItemId.get(activeId);
-      let toParentKey = lookup.parentKeyByItemId.get(overId);
 
-      if (!activeKind || !overKind || !fromParentKey || !toParentKey) {
+      if (!activeKind || !fromParentKey) {
         return;
       }
 
-      // Dropping a thread on a folder header means "move into this folder".
-      if (activeKind === "thread" && overKind === "folder") {
+      let toParentKey = overKind
+        ? lookup.parentKeyByItemId.get(overId)
+        : undefined;
+      if (!overKind && lookup.folderPathByParentKey.has(overId)) {
+        toParentKey = overId;
+      } else if (activeKind === "thread" && overKind === "folder") {
+        // Dropping a thread on a folder header means "move into this folder".
         toParentKey = overId;
       }
 
+      if (!toParentKey) {
+        return;
+      }
+
       if (activeKind !== "thread" || fromParentKey === toParentKey) {
         return;
       }
@@ -721,6 +743,36 @@ function ManualSortableList({
   );
 }
 
+function ManualDroppableParent({
+  children,
+  className,
+  manualSort,
+  parentKey,
+}: {
+  children: ReactNode;
+  className?: string;
+  manualSort?: ManualThreadTreeDndState | null;
+  parentKey: string;
+}) {
+  const { isOver, setNodeRef } = useDroppable({
+    id: parentKey,
+    disabled: !manualSort?.enabled,
+  });
+
+  return (
+    <div
+      ref={setNodeRef}
+      className={cn(
+        "rounded-md transition-colors",
+        isOver && "bg-sidebar-accent",
+        className,
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
 const ManualSortableThreadTreeItemRow = memo(
   function ManualSortableThreadTreeItemRow({
     manualSort,
@@ -1174,6 +1226,9 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   collapsedEnvironmentIds,
   variant,
   onProjectSelect,
+  onCreateThreadInFolder,
+  onRenameFolder,
+  onRemoveFolder,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
   consumeClickSuppression,
@@ -1192,6 +1247,9 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         collapsedEnvironmentIds={collapsedEnvironmentIds}
         variant={variant}
         onProjectSelect={onProjectSelect}
+        onCreateThreadInFolder={onCreateThreadInFolder}
+        onRenameFolder={onRenameFolder}
+        onRemoveFolder={onRemoveFolder}
         onToggleThreadCollapsed={onToggleThreadCollapsed}
         onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
         consumeClickSuppression={consumeClickSuppression}
@@ -1255,6 +1313,9 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   collapsedEnvironmentIds,
   variant,
   onProjectSelect,
+  onCreateThreadInFolder,
+  onRenameFolder,
+  onRemoveFolder,
   onToggleThreadCollapsed,
   onToggleEnvironmentCollapsed,
   consumeClickSuppression,
@@ -1278,12 +1339,17 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   const headerDepth = getThreadRowDepth({ depthOffset, nodeDepth: 0, variant });
   const stickyLevel =
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
+  const folderPath = folder.path.join("/");
+  const isDropTargetActive = dragBindings?.isOver === true;
 
   return (
     <SidebarStickyGroup
       ref={sortableRef}
       style={sortableStyle}
-      className="space-y-0.5"
+      className={cn(
+        "space-y-0.5 rounded-md transition-colors",
+        isDropTargetActive && "bg-sidebar-accent",
+      )}
     >
       <SidebarFolderRow
         name={folder.name}
@@ -1292,8 +1358,15 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
         activity={folder.activity}
         consumeClickSuppression={consumeClickSuppression}
         dragBindings={dragBindings}
-        isDropTargetActive={dragBindings?.isOver === true}
+        isDropTargetActive={isDropTargetActive}
         isCollapsed={isCollapsed}
+        onCreateThread={
+          onCreateThreadInFolder
+            ? () => onCreateThreadInFolder(folderPath)
+            : undefined
+        }
+        onRename={onRenameFolder ? () => onRenameFolder(folderPath) : undefined}
+        onRemove={onRemoveFolder ? () => onRemoveFolder(folderPath) : undefined}
         onToggleCollapsed={handleToggleCollapsed}
         stickyLevel={stickyLevel}
       />
@@ -1313,6 +1386,9 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
                 collapsedEnvironmentIds={collapsedEnvironmentIds}
                 variant={variant}
                 onProjectSelect={onProjectSelect}
+                onCreateThreadInFolder={onCreateThreadInFolder}
+                onRenameFolder={onRenameFolder}
+                onRemoveFolder={onRemoveFolder}
                 onToggleThreadCollapsed={onToggleThreadCollapsed}
                 onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
                 manualSort={manualSort}
@@ -1650,6 +1726,145 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   );
 });
 
+export const ChronologicalFolderThreadSections = memo(
+  function ChronologicalFolderThreadSections({
+    threadListState,
+    compareThreads,
+    folderPaths = EMPTY_FOLDER_PATHS,
+    selectedThreadId,
+    collapsedThreadIds,
+    collapsedEnvironmentIds,
+    onProjectSelect,
+    onCreateThreadInFolder,
+    onRenameFolder,
+    onRemoveFolder,
+    onToggleThreadCollapsed,
+    onToggleEnvironmentCollapsed,
+    renderFoldersSection,
+    renderThreadsSection,
+  }: ChronologicalFolderThreadSectionsProps) {
+    const groupBy = "folder" as const;
+    const threads =
+      threadListState.status === "ready"
+        ? threadListState.threads
+        : EMPTY_PROJECT_THREADS;
+    const rootItems = useMemo(
+      () =>
+        buildChronologicalThreadList(threads, compareThreads, {
+          groupBy,
+          containerId: CHRONOLOGICAL_CONTAINER_ID,
+          folderPaths,
+        }),
+      [threads, compareThreads, groupBy, folderPaths],
+    );
+    const manualSort = useManualThreadTreeDnd({
+      containerId: CHRONOLOGICAL_CONTAINER_ID,
+      enabled: hasFolderItems(rootItems),
+      rootItems,
+    });
+    const folderItems = rootItems.filter((item) => item.kind === "folder");
+    const looseItems = rootItems.filter((item) => item.kind !== "folder");
+
+    const renderItems = (items: readonly ProjectThreadItem[]) => (
+      <ProjectThreadTreeGroup
+        variant="section"
+        onClickCapture={manualSort?.onClickCapture}
+      >
+        {items.map((item) => (
+          <ManualSortableThreadTreeItemRow
+            key={getItemKey(item)}
+            projectId={getItemProjectId(item)}
+            item={item}
+            depthOffset={0}
+            selectedThreadId={selectedThreadId}
+            collapsedThreadIds={collapsedThreadIds}
+            collapsedEnvironmentIds={collapsedEnvironmentIds}
+            variant="section"
+            onProjectSelect={onProjectSelect}
+            onCreateThreadInFolder={onCreateThreadInFolder}
+            onRenameFolder={onRenameFolder}
+            onRemoveFolder={onRemoveFolder}
+            onToggleThreadCollapsed={onToggleThreadCollapsed}
+            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+            manualSort={manualSort ?? undefined}
+          />
+        ))}
+      </ProjectThreadTreeGroup>
+    );
+
+    const foldersContent =
+      threadListState.status === "loading" ? (
+        <div className="group-data-[collapsible=icon]:hidden">
+          <SidebarMenuSkeleton />
+        </div>
+      ) : folderItems.length > 0 ? (
+        renderItems(folderItems)
+      ) : (
+        <EmptyState
+          message={
+            threadListState.status === "unavailable"
+              ? "Folders unavailable"
+              : "No folders"
+          }
+          icon="Folder"
+          className={getProjectThreadTreeEmptyStateClassName("section")}
+          iconClassName="size-3.5"
+          messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
+            "section",
+          )}
+        />
+      );
+    const threadsListContent =
+      threadListState.status === "loading" ? (
+        <div className="group-data-[collapsible=icon]:hidden">
+          <SidebarMenuSkeleton />
+        </div>
+      ) : looseItems.length > 0 ? (
+        renderItems(looseItems)
+      ) : (
+        <EmptyState
+          message={
+            threadListState.status === "unavailable"
+              ? "Threads unavailable"
+              : "No threads"
+          }
+          icon={getProjectThreadTreeEmptyStateIcon("section")}
+          className={getProjectThreadTreeEmptyStateClassName("section")}
+          iconClassName="size-3.5"
+          messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
+            "section",
+          )}
+        />
+      );
+    const threadsContent = manualSort?.enabled ? (
+      <ManualDroppableParent
+        manualSort={manualSort}
+        parentKey={CHRONOLOGICAL_CONTAINER_ID}
+      >
+        {threadsListContent}
+      </ManualDroppableParent>
+    ) : (
+      threadsListContent
+    );
+
+    const sections = (
+      <ManualSortableList
+        manualSort={manualSort}
+        parentKey={CHRONOLOGICAL_CONTAINER_ID}
+      >
+        {renderFoldersSection(foldersContent)}
+        {renderThreadsSection(threadsContent)}
+      </ManualSortableList>
+    );
+
+    return manualSort ? (
+      <DndContext {...manualSort.dndContextProps}>{sections}</DndContext>
+    ) : (
+      sections
+    );
+  },
+);
+
 function ProjectRowComponent({
   project,
   threadListState,
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index c5d1f0b12..833e8a344 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -1,11 +1,24 @@
 import {
   memo,
   useCallback,
+  useState,
   type CSSProperties,
   type MouseEventHandler,
 } from "react";
+import { Button } from "@/components/ui/button.js";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu.js";
 import { Icon } from "@/components/ui/icon.js";
 import { SidebarStickyTier } from "@/components/ui/sidebar.js";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip.js";
 import {
   COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
   COARSE_POINTER_GLYPH_BOX_CLASS,
@@ -13,7 +26,10 @@ import {
   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
 } from "@/components/ui/coarse-pointer-sizing.js";
 import {
+  SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
+  SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
+  SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE,
   SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
 } from "@/components/ui/sidebar-hover-actions.js";
 import { cn } from "@/lib/utils";
@@ -44,6 +60,9 @@ interface SidebarFolderRowProps {
   consumeClickSuppression?: ConsumeDragClickSuppression;
   dragBindings?: SidebarSortableDragBindings;
   isDropTargetActive?: boolean;
+  onCreateThread?: () => void;
+  onRename?: () => void;
+  onRemove?: () => void;
 }
 
 // The "Work › Q3" disclosure header for a folder. Not a thread: clicking
@@ -59,8 +78,13 @@ function SidebarFolderRowComponent({
   isDropTargetActive = false,
   isCollapsed,
   onToggleCollapsed,
+  onCreateThread,
+  onRename,
+  onRemove,
   stickyLevel,
 }: SidebarFolderRowProps) {
+  const [isActionsOpen, setIsActionsOpen] = useState(false);
+  const hasActions = Boolean(onCreateThread || onRename || onRemove);
   // Collapsed: the header speaks for its hidden descendants through one glyph
   // (pending > working > unread). Expanded: descendants show their own glyphs.
   const showRollupGlyph =
@@ -75,8 +99,7 @@ function SidebarFolderRowComponent({
     COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
     "cursor-pointer",
     dragBindings && !dragBindings.disabled && "select-none",
-    isDropTargetActive &&
-      "bg-sidebar-accent text-sidebar-accent-foreground ring-1 ring-sidebar-ring",
+    isDropTargetActive && "bg-sidebar-accent text-sidebar-accent-foreground",
   );
   const style: CSSProperties = {
     paddingLeft: getSidebarThreadRowPaddingLeft(depth),
@@ -91,6 +114,12 @@ function SidebarFolderRowComponent({
     },
     [consumeClickSuppression],
   );
+  const stopActionsClick = useCallback<MouseEventHandler<HTMLElement>>(
+    (event) => {
+      event.stopPropagation();
+    },
+    [],
+  );
   const content = (
     <>
       {/* Full-bleed toggle target for pointer users; the chevron owns keyboard
@@ -132,11 +161,7 @@ function SidebarFolderRowComponent({
           COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
         )}
       >
-        {isDropTargetActive ? (
-          <span className="pointer-events-none absolute inset-0 flex items-center justify-end pr-1 text-xs font-medium text-sidebar-accent-foreground">
-            Drop inside
-          </span>
-        ) : showRollupGlyph ? (
+        {showRollupGlyph ? (
           <span
             className={cn(
               SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
@@ -152,6 +177,64 @@ function SidebarFolderRowComponent({
           </span>
         ) : null}
       </span>
+      {hasActions ? (
+        <span
+          data-sidebar-hover-actions-open={isActionsOpen ? "true" : undefined}
+          data-sidebar-hover-actions-mobile={
+            SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
+          }
+          className={cn(
+            SIDEBAR_HOVER_ACTIONS_CLASS,
+            "relative z-10 inline-flex shrink-0 items-center",
+            SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
+          )}
+          onClick={stopActionsClick}
+        >
+          <DropdownMenu onOpenChange={setIsActionsOpen}>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <DropdownMenuTrigger asChild>
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon"
+                    aria-label={`${pathLabel} folder actions`}
+                    title={undefined}
+                    className={cn(
+                      "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                      COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                    )}
+                  >
+                    <Icon
+                      name="MoreHorizontal"
+                      className={COARSE_POINTER_ICON_SIZE_CLASS}
+                    />
+                  </Button>
+                </DropdownMenuTrigger>
+              </TooltipTrigger>
+              <TooltipContent side="bottom">Folder actions</TooltipContent>
+            </Tooltip>
+            <DropdownMenuContent align="end" className="w-44">
+              {onCreateThread ? (
+                <DropdownMenuItem onSelect={onCreateThread}>
+                  New thread
+                </DropdownMenuItem>
+              ) : null}
+              {onRename ? (
+                <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
+              ) : null}
+              {onRemove ? (
+                <DropdownMenuItem
+                  className="text-destructive focus:text-destructive"
+                  onSelect={onRemove}
+                >
+                  Remove
+                </DropdownMenuItem>
+              ) : null}
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </span>
+      ) : null}
     </>
   );
 
diff --git a/apps/app/src/hooks/mutations/thread-folder-mutations.ts b/apps/app/src/hooks/mutations/thread-folder-mutations.ts
index e2122eb71..36c11ee64 100644
--- a/apps/app/src/hooks/mutations/thread-folder-mutations.ts
+++ b/apps/app/src/hooks/mutations/thread-folder-mutations.ts
@@ -1,7 +1,21 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import type { CreateThreadFolderRequest } from "@bb/server-contract";
+import type {
+  CreateThreadFolderRequest,
+  DeleteThreadFolderRequest,
+  UpdateThreadFolderRequest,
+} from "@bb/server-contract";
 import * as api from "@/lib/api";
-import { invalidateProjectListQueries } from "../cache-owners/mutation-cache-effects";
+import {
+  invalidateProjectListQueries,
+  invalidateThreadListQueries,
+} from "../cache-owners/mutation-cache-effects";
+
+function invalidateThreadFolderQueries(
+  queryClient: ReturnType<typeof useQueryClient>,
+) {
+  invalidateProjectListQueries({ queryClient });
+  invalidateThreadListQueries({ queryClient });
+}
 
 export function useCreateThreadFolder() {
   const queryClient = useQueryClient();
@@ -13,7 +27,37 @@ export function useCreateThreadFolder() {
     mutationFn: (request: CreateThreadFolderRequest) =>
       api.createThreadFolder(request),
     onSuccess: () => {
-      invalidateProjectListQueries({ queryClient });
+      invalidateThreadFolderQueries(queryClient);
+    },
+  });
+}
+
+export function useUpdateThreadFolder() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    meta: {
+      errorMessage: "Failed to rename folder.",
+    },
+    mutationFn: (request: UpdateThreadFolderRequest) =>
+      api.updateThreadFolder(request),
+    onSuccess: () => {
+      invalidateThreadFolderQueries(queryClient);
+    },
+  });
+}
+
+export function useDeleteThreadFolder() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    meta: {
+      errorMessage: "Failed to remove folder.",
+    },
+    mutationFn: (request: DeleteThreadFolderRequest) =>
+      api.deleteThreadFolder(request),
+    onSuccess: () => {
+      invalidateThreadFolderQueries(queryClient);
     },
   });
 }
diff --git a/apps/app/src/lib/api.ts b/apps/app/src/lib/api.ts
index 0d0000ff4..52f3fc44e 100644
--- a/apps/app/src/lib/api.ts
+++ b/apps/app/src/lib/api.ts
@@ -20,6 +20,7 @@ import type {
   CreateProjectRequest,
   CreateThreadFolderRequest,
   CreateQueuedMessageRequest,
+  DeleteThreadFolderRequest,
   DeleteThreadRequest,
   EnvironmentArchiveThreadsResponse,
   EnvironmentActionRequest,
@@ -51,6 +52,7 @@ import type {
   SystemVoiceTranscriptionResponse,
   ThreadArchiveAllResponse,
   ThreadChildSummaryResponse,
+  ThreadFolderMutationResponse,
   ThreadFolderResponse,
   ThreadPendingInteractionsResponse,
   ThreadQueuedMessageListResponse,
@@ -72,6 +74,7 @@ import type {
   CloseThreadTerminalRequest,
   ResolvePendingInteractionRequest,
   UpdateEnvironmentRequest,
+  UpdateThreadFolderRequest,
   UpdateProjectRequest,
   UpdateThreadRequest,
   UpdateThreadTerminalRequest,
@@ -490,6 +493,22 @@ export async function createThreadFolder(
   );
 }
 
+export async function updateThreadFolder(
+  req: UpdateThreadFolderRequest,
+): Promise<ThreadFolderMutationResponse> {
+  return request<ThreadFolderMutationResponse>(
+    apiClient["thread-folders"].$patch({ json: req }),
+  );
+}
+
+export async function deleteThreadFolder(
+  req: DeleteThreadFolderRequest,
+): Promise<ThreadFolderMutationResponse> {
+  return request<ThreadFolderMutationResponse>(
+    apiClient["thread-folders"].$delete({ json: req }),
+  );
+}
+
 export async function updateProject(
   id: string,
   req: UpdateProjectRequest,
diff --git a/apps/app/src/views/RootComposeView.tsx b/apps/app/src/views/RootComposeView.tsx
index be21a7be4..425f50d81 100644
--- a/apps/app/src/views/RootComposeView.tsx
+++ b/apps/app/src/views/RootComposeView.tsx
@@ -82,6 +82,17 @@ interface LegacyProjectComposeRedirectProps {
   projectId: string;
 }
 
+function readFolderPathFromLocationState(state: unknown): string | null {
+  if (typeof state !== "object" || state === null) {
+    return null;
+  }
+  if (!("folderPath" in state) || typeof state.folderPath !== "string") {
+    return null;
+  }
+  const folderPath = state.folderPath.trim();
+  return folderPath.length > 0 ? folderPath : null;
+}
+
 type RootComposeViewProps =
   | {
       surface: "page";
@@ -352,6 +363,9 @@ export function RootComposeView(props: RootComposeViewProps) {
     useRootComposeProjectId();
   const location = useLocation();
   const navigate = useNavigate();
+  const [rootComposeFolderPath, setRootComposeFolderPath] = useState<
+    string | null
+  >(() => readFolderPathFromLocationState(location.state));
   const promptBoxRef = useRef<PromptBoxHandle>(null);
   const quickCreateProject = useQuickCreateProjectController();
   const sidebarNavigationQuery = useSidebarNavigation();
@@ -387,6 +401,9 @@ export function RootComposeView(props: RootComposeViewProps) {
   const [forkSeed, setForkSeed] = useState<ForkThreadCreateSeed | null>(() =>
     readForkThreadCreateSeedFromLocationState(location.state),
   );
+  useEffect(() => {
+    setRootComposeFolderPath(readFolderPathFromLocationState(location.state));
+  }, [location.key, location.state]);
   const primaryHostId = usePrimaryHost()?.id ?? null;
   const uploadPromptAttachment = useUploadPromptAttachment();
   const promptDraft = usePromptDraftStorage({ kind: "new-thread" });
@@ -825,6 +842,9 @@ export function RootComposeView(props: RootComposeViewProps) {
                 projectId,
                 providerId: selectedProviderId,
                 model: selectedThreadModel,
+                ...(rootComposeFolderPath
+                  ? { folderPath: rootComposeFolderPath }
+                  : {}),
                 ...(supportsServiceTier && serviceTier ? { serviceTier } : {}),
                 reasoningLevel,
                 permissionMode,
@@ -839,6 +859,7 @@ export function RootComposeView(props: RootComposeViewProps) {
       setLastCreatedThreadId(thread.id);
       clearReuseEnvironment();
       setForkSeed(null);
+      setRootComposeFolderPath(null);
       promptDraft.clearIfCurrentMatches(submittedDraft);
       if (props.surface === "popout") {
         props.onThreadCreated({
@@ -868,6 +889,7 @@ export function RootComposeView(props: RootComposeViewProps) {
     props,
     promptDraft,
     reasoningLevel,
+    rootComposeFolderPath,
     selectedEnvironment,
     selectedProviderId,
     selectedThreadModel,
diff --git a/apps/server/src/routes/thread-folders.ts b/apps/server/src/routes/thread-folders.ts
index fa5a17e65..ed01cf9f9 100644
--- a/apps/server/src/routes/thread-folders.ts
+++ b/apps/server/src/routes/thread-folders.ts
@@ -1,4 +1,9 @@
-import { createThreadFolder, normalizeThreadFolderPath } from "@bb/db";
+import {
+  createThreadFolder,
+  deleteThreadFolder,
+  normalizeThreadFolderPath,
+  renameThreadFolder,
+} from "@bb/db";
 import {
   publicApiRoutes,
   typedRoutes,
@@ -10,7 +15,7 @@ import { ApiError } from "../errors.js";
 import { requirePublicProject } from "../services/lib/entity-lookup.js";
 
 export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
-  const { post } = typedRoutes<PublicApiSchema>(app, {
+  const { del, patch, post } = typedRoutes<PublicApiSchema>(app, {
     onValidationError: (msg) => new ApiError(400, "invalid_request", msg),
   });
   const routes = publicApiRoutes.threadFolders;
@@ -32,4 +37,29 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
       201,
     );
   });
+
+  patch(routes.update, (context, payload) => {
+    const path = normalizeThreadFolderPath(payload.path);
+    const newPath = normalizeThreadFolderPath(payload.newPath);
+    if (!path || !newPath) {
+      throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
+    }
+    const result = renameThreadFolder(deps.db, deps.hub, { path, newPath });
+    if (!result) {
+      throw new ApiError(404, "folder_not_found", "Folder not found");
+    }
+    return context.json(result);
+  });
+
+  del(routes.delete, (context, payload) => {
+    const path = normalizeThreadFolderPath(payload.path);
+    if (!path) {
+      throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
+    }
+    const result = deleteThreadFolder(deps.db, deps.hub, { path });
+    if (!result) {
+      throw new ApiError(404, "folder_not_found", "Folder not found");
+    }
+    return context.json(result);
+  });
 }
diff --git a/apps/server/src/routes/threads/base.ts b/apps/server/src/routes/threads/base.ts
index 26c489a3c..a8b658165 100644
--- a/apps/server/src/routes/threads/base.ts
+++ b/apps/server/src/routes/threads/base.ts
@@ -249,6 +249,10 @@ export function registerThreadBaseRoutes(app: Hono, deps: AppDeps): void {
   post(routes.create, async (context, payload) => {
     const thread = await createThreadFromRequest(deps, {
       ...payload,
+      folderPath:
+        payload.folderPath === undefined
+          ? undefined
+          : normalizeThreadFolderPath(payload.folderPath),
       origin: payload.origin,
     });
     return context.json(toThreadResponseFromThread(deps, { thread }), 201);
diff --git a/apps/server/src/services/threads/thread-create-helpers.ts b/apps/server/src/services/threads/thread-create-helpers.ts
index 0490fba4b..34a9fd234 100644
--- a/apps/server/src/services/threads/thread-create-helpers.ts
+++ b/apps/server/src/services/threads/thread-create-helpers.ts
@@ -168,6 +168,7 @@ export function createThreadRecord(
     providerId: args.request.providerId,
     title: args.request.title ?? null,
     titleFallback: deriveTitleFallback(args.request.input),
+    folderPath: args.request.folderPath ?? null,
     parentThreadId: args.request.parentThreadId ?? null,
     sourceThreadId: args.request.sourceThreadId ?? null,
     originKind: args.request.originKind ?? args.request.childOrigin,
diff --git a/apps/server/src/services/threads/thread-create-request.ts b/apps/server/src/services/threads/thread-create-request.ts
index 179e9ae03..bd1790ff6 100644
--- a/apps/server/src/services/threads/thread-create-request.ts
+++ b/apps/server/src/services/threads/thread-create-request.ts
@@ -16,6 +16,7 @@ export interface ThreadCreateServiceRequestInput {
   environment: EnvironmentArgs;
   executionInputSources?: CreateThreadRequest["executionInputSources"];
   input: PromptInput[];
+  folderPath?: CreateThreadRequest["folderPath"];
   model?: CreateThreadRequest["model"];
   origin: ThreadCreateOrigin | null;
   originKind?: ThreadOriginKind | null;
diff --git a/packages/db/src/data/index.ts b/packages/db/src/data/index.ts
index 98e680db0..feeb712ce 100644
--- a/packages/db/src/data/index.ts
+++ b/packages/db/src/data/index.ts
@@ -21,13 +21,18 @@ export type {
 
 export {
   createThreadFolder,
+  deleteThreadFolder,
   ensureThreadFolderPath,
   getThreadFolderByPath,
   listThreadFolders,
   normalizeThreadFolderPath,
+  renameThreadFolder,
 } from "./thread-folders.js";
 export type {
   CreateThreadFolderInput,
+  DeleteThreadFolderInput,
+  RenameThreadFolderInput,
+  ThreadFolderMutationResult,
   ThreadFolderRow,
 } from "./thread-folders.js";
 
diff --git a/packages/db/src/data/thread-folders.ts b/packages/db/src/data/thread-folders.ts
index ecc187c0e..4c146afbf 100644
--- a/packages/db/src/data/thread-folders.ts
+++ b/packages/db/src/data/thread-folders.ts
@@ -1,4 +1,4 @@
-import { and, asc, eq, isNull } from "drizzle-orm";
+import { and, asc, eq, isNull, or, sql } from "drizzle-orm";
 import { PERSONAL_PROJECT_ID } from "@bb/domain";
 import type {
   DbConnection,
@@ -7,7 +7,7 @@ import type {
 } from "../connection.js";
 import { createThreadFolderId } from "../ids.js";
 import type { DbNotifier } from "../notifier.js";
-import { threadFolders } from "../schema.js";
+import { threadFolders, threads } from "../schema.js";
 
 type ThreadFolderWriteConnection = DbConnection | DbTransaction;
 
@@ -18,6 +18,20 @@ export interface CreateThreadFolderInput {
   projectId?: string | null;
 }
 
+export interface RenameThreadFolderInput {
+  path: string;
+  newPath: string;
+}
+
+export interface DeleteThreadFolderInput {
+  path: string;
+}
+
+export interface ThreadFolderMutationResult {
+  path: string;
+  updatedThreadCount: number;
+}
+
 function splitFolderSegments(path: string): string[] {
   return path
     .split("/")
@@ -41,6 +55,38 @@ function folderAncestors(path: string): string[] {
   return ancestors;
 }
 
+function folderPathSubtreeFilter(
+  column: typeof threadFolders.path | typeof threads.folderPath,
+  path: string,
+) {
+  return or(
+    eq(column, path),
+    sql`substr(${column}, 1, ${path.length + 1}) = ${`${path}/`}`,
+  );
+}
+
+function replaceFolderPathPrefix(
+  value: string,
+  oldPath: string,
+  newPath: string,
+): string {
+  if (value === oldPath) {
+    return newPath;
+  }
+  return `${newPath}/${value.slice(oldPath.length + 1)}`;
+}
+
+function notifyThreadFolderMutationProjects(
+  notifier: DbNotifier,
+  projectIds: ReadonlySet<string | null>,
+): void {
+  for (const projectId of projectIds) {
+    notifier.notifyProject(projectId ?? PERSONAL_PROJECT_ID, [
+      "threads-changed",
+    ]);
+  }
+}
+
 export function getThreadFolderByPath(
   db: DbQueryConnection,
   path: string,
@@ -136,3 +182,137 @@ export function createThreadFolder(
   }
   return folder;
 }
+
+export function renameThreadFolder(
+  db: DbConnection,
+  notifier: DbNotifier,
+  input: RenameThreadFolderInput,
+): ThreadFolderMutationResult | null {
+  const path = normalizeThreadFolderPath(input.path);
+  const newPath = normalizeThreadFolderPath(input.newPath);
+  if (!path || !newPath) {
+    return null;
+  }
+  if (path === newPath) {
+    return { path: newPath, updatedThreadCount: 0 };
+  }
+
+  return db.transaction(
+    (tx) => {
+      const matchingFolders = tx
+        .select()
+        .from(threadFolders)
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .all();
+      const matchingThreads = tx
+        .select({
+          id: threads.id,
+          projectId: threads.projectId,
+          folderPath: threads.folderPath,
+        })
+        .from(threads)
+        .where(folderPathSubtreeFilter(threads.folderPath, path))
+        .all();
+
+      if (matchingFolders.length === 0 && matchingThreads.length === 0) {
+        return null;
+      }
+
+      tx.delete(threadFolders)
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .run();
+
+      const affectedProjects = new Set<string | null>();
+      for (const folder of matchingFolders) {
+        affectedProjects.add(folder.projectId);
+        ensureThreadFolderPath(
+          tx,
+          notifier,
+          replaceFolderPathPrefix(folder.path, path, newPath),
+          folder.projectId,
+        );
+      }
+
+      const now = Date.now();
+      for (const thread of matchingThreads) {
+        if (!thread.folderPath) {
+          continue;
+        }
+        const nextFolderPath = replaceFolderPathPrefix(
+          thread.folderPath,
+          path,
+          newPath,
+        );
+        affectedProjects.add(thread.projectId);
+        ensureThreadFolderPath(tx, notifier, nextFolderPath, thread.projectId);
+        tx.update(threads)
+          .set({ folderPath: nextFolderPath, updatedAt: now })
+          .where(eq(threads.id, thread.id))
+          .run();
+        notifier.notifyThread(thread.id, ["title-changed"], {
+          projectId: thread.projectId,
+        });
+      }
+
+      notifyThreadFolderMutationProjects(notifier, affectedProjects);
+      return { path: newPath, updatedThreadCount: matchingThreads.length };
+    },
+    { behavior: "immediate" },
+  );
+}
+
+export function deleteThreadFolder(
+  db: DbConnection,
+  notifier: DbNotifier,
+  input: DeleteThreadFolderInput,
+): ThreadFolderMutationResult | null {
+  const path = normalizeThreadFolderPath(input.path);
+  if (!path) {
+    return null;
+  }
+
+  return db.transaction(
+    (tx) => {
+      const matchingFolders = tx
+        .select()
+        .from(threadFolders)
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .all();
+      const matchingThreads = tx
+        .select({
+          id: threads.id,
+          projectId: threads.projectId,
+        })
+        .from(threads)
+        .where(folderPathSubtreeFilter(threads.folderPath, path))
+        .all();
+
+      if (matchingFolders.length === 0 && matchingThreads.length === 0) {
+        return null;
+      }
+
+      tx.delete(threadFolders)
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .run();
+
+      const now = Date.now();
+      const affectedProjects = new Set<string | null>(
+        matchingFolders.map((folder) => folder.projectId),
+      );
+      for (const thread of matchingThreads) {
+        affectedProjects.add(thread.projectId);
+        tx.update(threads)
+          .set({ folderPath: null, updatedAt: now })
+          .where(eq(threads.id, thread.id))
+          .run();
+        notifier.notifyThread(thread.id, ["title-changed"], {
+          projectId: thread.projectId,
+        });
+      }
+
+      notifyThreadFolderMutationProjects(notifier, affectedProjects);
+      return { path, updatedThreadCount: matchingThreads.length };
+    },
+    { behavior: "immediate" },
+  );
+}
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 57599c8a0..7db6400c7 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -30,7 +30,9 @@ import {
 } from "../../src/data/threads.js";
 import {
   createThreadFolder,
+  deleteThreadFolder,
   listThreadFolders,
+  renameThreadFolder,
 } from "../../src/data/thread-folders.js";
 import { createProject } from "../../src/data/projects.js";
 import { upsertHost } from "../../src/data/hosts.js";
@@ -689,6 +691,91 @@ describe("threads", () => {
     expect(folders).toEqual(expectedFolders);
   });
 
+  it("renames thread folders and moves descendant threads", () => {
+    const { db, host, project } = setup();
+    const { project: otherProject } = createProject(db, noopNotifier, {
+      name: "other-project",
+      source: { type: "local_path", hostId: host.id, path: "/tmp/other" },
+    });
+    const spy: DbNotifier = {
+      notifyThread: vi.fn(),
+      notifyEnvironment: vi.fn(),
+      notifyHost: vi.fn(),
+      notifyProject: vi.fn(),
+      notifySystem: vi.fn(),
+    };
+    const firstThread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    const secondThread = createThread(db, noopNotifier, {
+      projectId: otherProject.id,
+      providerId: "codex",
+      folderPath: "Work",
+    });
+    createThreadFolder(db, noopNotifier, { path: "Work/Empty" });
+
+    const result = renameThreadFolder(db, spy, {
+      path: "Work",
+      newPath: "Archive",
+    });
+
+    expect(result).toEqual({ path: "Archive", updatedThreadCount: 2 });
+    expect(getThread(db, firstThread.id)?.folderPath).toBe("Archive/Q3");
+    expect(getThread(db, secondThread.id)?.folderPath).toBe("Archive");
+    expect(
+      listThreadFolders(db)
+        .map((folder) => ({
+          path: folder.path,
+          projectId: folder.projectId,
+        }))
+        .sort((left, right) =>
+          `${left.projectId ?? ""}:${left.path}`.localeCompare(
+            `${right.projectId ?? ""}:${right.path}`,
+          ),
+        ),
+    ).toEqual(
+      [
+        { path: "Archive", projectId: null },
+        { path: "Archive/Empty", projectId: null },
+        { path: "Archive", projectId: project.id },
+        { path: "Archive/Q3", projectId: project.id },
+        { path: "Archive", projectId: otherProject.id },
+      ].sort((left, right) =>
+        `${left.projectId ?? ""}:${left.path}`.localeCompare(
+          `${right.projectId ?? ""}:${right.path}`,
+        ),
+      ),
+    );
+    expect(spy.notifyThread).toHaveBeenCalledWith(
+      firstThread.id,
+      ["title-changed"],
+      { projectId: project.id },
+    );
+    expect(spy.notifyThread).toHaveBeenCalledWith(
+      secondThread.id,
+      ["title-changed"],
+      { projectId: otherProject.id },
+    );
+  });
+
+  it("removes thread folders and clears descendant thread folder paths", () => {
+    const { db, project } = setup();
+    const thread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    createThreadFolder(db, noopNotifier, { path: "Work/Empty" });
+
+    const result = deleteThreadFolder(db, noopNotifier, { path: "Work" });
+
+    expect(result).toEqual({ path: "Work", updatedThreadCount: 1 });
+    expect(getThread(db, thread.id)?.folderPath).toBeNull();
+    expect(listThreadFolders(db)).toEqual([]);
+  });
+
   it("notifies when a thread parent changes", () => {
     const { db, project } = setup();
     const spy: DbNotifier = {
diff --git a/packages/server-contract/src/api/projects.ts b/packages/server-contract/src/api/projects.ts
index 0fabeecd3..876423370 100644
--- a/packages/server-contract/src/api/projects.ts
+++ b/packages/server-contract/src/api/projects.ts
@@ -75,6 +75,35 @@ export type CreateThreadFolderRequest = z.infer<
   typeof createThreadFolderRequestSchema
 >;
 
+export const updateThreadFolderRequestSchema = z
+  .object({
+    path: z.string().min(1),
+    newPath: z.string().min(1),
+  })
+  .strict();
+export type UpdateThreadFolderRequest = z.infer<
+  typeof updateThreadFolderRequestSchema
+>;
+
+export const deleteThreadFolderRequestSchema = z
+  .object({
+    path: z.string().min(1),
+  })
+  .strict();
+export type DeleteThreadFolderRequest = z.infer<
+  typeof deleteThreadFolderRequestSchema
+>;
+
+export const threadFolderMutationResponseSchema = z
+  .object({
+    path: z.string().min(1),
+    updatedThreadCount: z.number().int().nonnegative(),
+  })
+  .strict();
+export type ThreadFolderMutationResponse = z.infer<
+  typeof threadFolderMutationResponseSchema
+>;
+
 export const reorderProjectRequestSchema = z.object({
   previousProjectId: z.string().min(1).nullable(),
   nextProjectId: z.string().min(1).nullable(),
diff --git a/packages/server-contract/src/api/threads.ts b/packages/server-contract/src/api/threads.ts
index 255fd614c..03a93ecd8 100644
--- a/packages/server-contract/src/api/threads.ts
+++ b/packages/server-contract/src/api/threads.ts
@@ -112,6 +112,7 @@ export const createThreadRequestSchema = z
     executionInputSources: createExecutionInputSourcesSchema.optional(),
     environment: environmentArgsSchema,
     parentThreadId: z.string().min(1).optional(),
+    folderPath: z.string().min(1).nullable().optional(),
     sourceThreadId: z.string().min(1).optional(),
     sourceSeqEnd: z.number().int().nonnegative().optional(),
     startedOnBehalfOf: startedOnBehalfOfSchema.nullable().default(null),
diff --git a/packages/server-contract/src/public-api.ts b/packages/server-contract/src/public-api.ts
index 073e96b3e..011e00abd 100644
--- a/packages/server-contract/src/public-api.ts
+++ b/packages/server-contract/src/public-api.ts
@@ -49,6 +49,7 @@ import type {
   CreateThreadFolderRequest,
   CreateThreadRequest,
   CreateThreadTerminalRequest,
+  DeleteThreadFolderRequest,
   DeleteThreadRequest,
   EnvironmentActionApiError,
   EnvironmentActionRequest,
@@ -102,6 +103,7 @@ import type {
   ThreadComposerBootstrapResponse,
   ThreadEventWaitQuery,
   ThreadEventsQuery,
+  ThreadFolderMutationResponse,
   ThreadFolderResponse,
   ThreadFilesRawQuery,
   ThreadGetQuery,
@@ -125,6 +127,7 @@ import type {
   TimelineTurnSummaryDetailsQuery,
   TimelineTurnSummaryDetailsResponse,
   UpdateEnvironmentRequest,
+  UpdateThreadFolderRequest,
   UpdateProjectRequest,
   UpdateProjectSourceRequest,
   UpdateThreadRequest,
@@ -140,6 +143,7 @@ import {
   updateAutomationRequestSchema,
   closeThreadTerminalRequestSchema,
   createThreadFolderRequestSchema,
+  deleteThreadFolderRequestSchema,
   createProjectRequestSchema,
   createProjectSourceRequestSchema,
   createQueuedMessageRequestSchema,
@@ -181,6 +185,7 @@ import {
   threadTimelineQuerySchema,
   timelineTurnSummaryDetailsQuerySchema,
   updateEnvironmentRequestSchema,
+  updateThreadFolderRequestSchema,
   updateProjectRequestSchema,
   updateProjectSourceRequestSchema,
   updateThreadRequestSchema,
@@ -461,6 +466,22 @@ export const publicApiRoutes = {
       ),
       response: jsonResponse<ThreadFolderResponse>({ status: 201 }),
     }),
+    update: defineRoute({
+      path: "/thread-folders",
+      method: "patch",
+      request: jsonRequest<EmptyInput, UpdateThreadFolderRequest>(
+        updateThreadFolderRequestSchema,
+      ),
+      response: jsonResponse<ThreadFolderMutationResponse>(),
+    }),
+    delete: defineRoute({
+      path: "/thread-folders",
+      method: "delete",
+      request: jsonRequest<EmptyInput, DeleteThreadFolderRequest>(
+        deleteThreadFolderRequestSchema,
+      ),
+      response: jsonResponse<ThreadFolderMutationResponse>(),
+    }),
   },
 
   threads: {
diff --git a/packages/server-contract/test/contract.test.ts b/packages/server-contract/test/contract.test.ts
index 7a0a3ea6d..feb97e880 100644
--- a/packages/server-contract/test/contract.test.ts
+++ b/packages/server-contract/test/contract.test.ts
@@ -66,6 +66,7 @@ const OPTIONAL_SERVER_FIELD_GROUPS: readonly OptionalServerFieldGroup[] = [
     reason:
       "Thread creation may omit root-thread presentation and execution fields so the server can resolve project/provider defaults.",
     fields: [
+      "createThreadRequestSchema.folderPath",
       "createThreadRequestSchema.model",
       "createThreadRequestSchema.parentThreadId",
       "createThreadRequestSchema.providerId",

From 206518c08a11b79554b9a49673127c7964a6834c Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 02:54:02 -0700
Subject: [PATCH 22/54] Paint folder drop hover on rows

---
 apps/app/src/components/sidebar/ProjectRow.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 812445b54..718b06a76 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -1348,7 +1348,8 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
       style={sortableStyle}
       className={cn(
         "space-y-0.5 rounded-md transition-colors",
-        isDropTargetActive && "bg-sidebar-accent",
+        isDropTargetActive &&
+          "[&_.bb-sidebar-hover-actions-row]:!bg-sidebar-accent [&_.bb-sidebar-hover-actions-row]:!text-sidebar-accent-foreground",
       )}
     >
       <SidebarFolderRow

From 0d3a1f220f031aae2504cc71ef9e92abdfa8681f Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 02:56:50 -0700
Subject: [PATCH 23/54] Prevent dragging folders into loose threads

---
 apps/app/src/components/sidebar/ProjectRow.tsx    | 8 +++++++-
 apps/app/src/components/sidebar/sortableMotion.ts | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 718b06a76..c792e58fe 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -779,9 +779,15 @@ const ManualSortableThreadTreeItemRow = memo(
     ...props
   }: ThreadTreeItemRowProps) {
     const itemId = getManualOrderItemKey(props.item);
+    const sortableDisabled =
+      !manualSort?.enabled || props.item.kind === "environment"
+        ? true
+        : props.item.kind === "folder"
+          ? { draggable: true }
+          : false;
     const { dragBindings, setNodeRef, style } = useSidebarSortable({
       id: itemId,
-      disabled: !manualSort?.enabled || props.item.kind === "environment",
+      disabled: sortableDisabled,
     });
 
     if (!manualSort?.enabled || props.item.kind === "environment") {
diff --git a/apps/app/src/components/sidebar/sortableMotion.ts b/apps/app/src/components/sidebar/sortableMotion.ts
index e1fbca873..dab75c268 100644
--- a/apps/app/src/components/sidebar/sortableMotion.ts
+++ b/apps/app/src/components/sidebar/sortableMotion.ts
@@ -11,6 +11,11 @@ const SIDEBAR_SORTABLE_TRANSITION = {
   easing: "cubic-bezier(0.2, 0, 0, 1)",
 };
 
+type SortableDisabled = {
+  draggable?: boolean;
+  droppable?: boolean;
+};
+
 /**
  * Drag-handle plumbing shared by every sortable sidebar surface (sections,
  * projects, pinned roots, manager roots). Spread `attributes`/`listeners` onto
@@ -18,7 +23,7 @@ const SIDEBAR_SORTABLE_TRANSITION = {
  */
 export interface SidebarSortableDragBindings {
   attributes: DraggableAttributes;
-  disabled: boolean;
+  disabled: boolean | SortableDisabled;
   isOver: boolean;
   listeners: DraggableSyntheticListeners;
   setActivatorNodeRef: (element: HTMLDivElement | null) => void;
@@ -26,7 +31,7 @@ export interface SidebarSortableDragBindings {
 
 export interface UseSidebarSortableArgs {
   id: string;
-  disabled: boolean;
+  disabled: boolean | SortableDisabled;
 }
 
 export interface UseSidebarSortableResult {

From ba5d2f0640bb4b3bc89819eaac625ae177aed033 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:01:25 -0700
Subject: [PATCH 24/54] Restrict folder drag targets to threads

---
 .../app/src/components/sidebar/ProjectRow.tsx | 59 +++++++++++++++----
 .../src/components/sidebar/sortableMotion.ts  | 21 ++-----
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index c792e58fe..4fff61b1d 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -239,6 +239,7 @@ interface ThreadTreeItemRowProps {
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
   consumeClickSuppression?: ConsumeDragClickSuppression;
   dragBindings?: SidebarSortableDragBindings;
+  isDropTargetActive?: boolean;
   manualSort?: ManualThreadTreeDndState;
   sortableRef?: (element: HTMLDivElement | null) => void;
   sortableStyle?: CSSProperties;
@@ -259,6 +260,7 @@ interface FolderTreeItemRowProps {
   onToggleEnvironmentCollapsed: (environmentId: string) => void;
   consumeClickSuppression?: ConsumeDragClickSuppression;
   dragBindings?: SidebarSortableDragBindings;
+  isDropTargetActive?: boolean;
   manualSort?: ManualThreadTreeDndState;
   sortableRef?: (element: HTMLDivElement | null) => void;
   sortableStyle?: CSSProperties;
@@ -778,22 +780,33 @@ const ManualSortableThreadTreeItemRow = memo(
     manualSort,
     ...props
   }: ThreadTreeItemRowProps) {
+    if (!manualSort?.enabled || props.item.kind === "environment") {
+      return <ThreadTreeItemRow manualSort={manualSort} {...props} />;
+    }
+
+    if (props.item.kind === "folder") {
+      return (
+        <ManualDroppableFolderTreeItemRow {...props} manualSort={manualSort} />
+      );
+    }
+
+    return (
+      <ManualDraggableThreadTreeItemRow {...props} manualSort={manualSort} />
+    );
+  },
+);
+
+const ManualDraggableThreadTreeItemRow = memo(
+  function ManualDraggableThreadTreeItemRow({
+    manualSort,
+    ...props
+  }: ThreadTreeItemRowProps & { manualSort: ManualThreadTreeDndState }) {
     const itemId = getManualOrderItemKey(props.item);
-    const sortableDisabled =
-      !manualSort?.enabled || props.item.kind === "environment"
-        ? true
-        : props.item.kind === "folder"
-          ? { draggable: true }
-          : false;
     const { dragBindings, setNodeRef, style } = useSidebarSortable({
       id: itemId,
-      disabled: sortableDisabled,
+      disabled: false,
     });
 
-    if (!manualSort?.enabled || props.item.kind === "environment") {
-      return <ThreadTreeItemRow manualSort={manualSort} {...props} />;
-    }
-
     return (
       <ThreadTreeItemRow
         {...props}
@@ -807,6 +820,26 @@ const ManualSortableThreadTreeItemRow = memo(
   },
 );
 
+const ManualDroppableFolderTreeItemRow = memo(
+  function ManualDroppableFolderTreeItemRow({
+    manualSort,
+    ...props
+  }: ThreadTreeItemRowProps & { manualSort: ManualThreadTreeDndState }) {
+    const itemId = getManualOrderItemKey(props.item);
+    const { isOver, setNodeRef } = useDroppable({ id: itemId });
+
+    return (
+      <ThreadTreeItemRow
+        {...props}
+        consumeClickSuppression={manualSort.consumeClickSuppression}
+        isDropTargetActive={isOver}
+        manualSort={manualSort}
+        sortableRef={setNodeRef}
+      />
+    );
+  },
+);
+
 function useArchiveEnvironmentThreadGroupAction({
   environmentId,
   projectId,
@@ -1239,6 +1272,7 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   onToggleEnvironmentCollapsed,
   consumeClickSuppression,
   dragBindings,
+  isDropTargetActive,
   manualSort,
   sortableRef,
   sortableStyle,
@@ -1260,6 +1294,7 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
         consumeClickSuppression={consumeClickSuppression}
         dragBindings={dragBindings}
+        isDropTargetActive={isDropTargetActive}
         manualSort={manualSort}
         sortableRef={sortableRef}
         sortableStyle={sortableStyle}
@@ -1326,6 +1361,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   onToggleEnvironmentCollapsed,
   consumeClickSuppression,
   dragBindings,
+  isDropTargetActive = false,
   manualSort,
   sortableRef,
   sortableStyle,
@@ -1346,7 +1382,6 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   const stickyLevel =
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
   const folderPath = folder.path.join("/");
-  const isDropTargetActive = dragBindings?.isOver === true;
 
   return (
     <SidebarStickyGroup
diff --git a/apps/app/src/components/sidebar/sortableMotion.ts b/apps/app/src/components/sidebar/sortableMotion.ts
index dab75c268..5b2e9a739 100644
--- a/apps/app/src/components/sidebar/sortableMotion.ts
+++ b/apps/app/src/components/sidebar/sortableMotion.ts
@@ -11,11 +11,6 @@ const SIDEBAR_SORTABLE_TRANSITION = {
   easing: "cubic-bezier(0.2, 0, 0, 1)",
 };
 
-type SortableDisabled = {
-  draggable?: boolean;
-  droppable?: boolean;
-};
-
 /**
  * Drag-handle plumbing shared by every sortable sidebar surface (sections,
  * projects, pinned roots, manager roots). Spread `attributes`/`listeners` onto
@@ -23,15 +18,14 @@ type SortableDisabled = {
  */
 export interface SidebarSortableDragBindings {
   attributes: DraggableAttributes;
-  disabled: boolean | SortableDisabled;
-  isOver: boolean;
+  disabled: boolean;
   listeners: DraggableSyntheticListeners;
   setActivatorNodeRef: (element: HTMLDivElement | null) => void;
 }
 
 export interface UseSidebarSortableArgs {
   id: string;
-  disabled: boolean | SortableDisabled;
+  disabled: boolean;
 }
 
 export interface UseSidebarSortableResult {
@@ -52,7 +46,6 @@ export function useSidebarSortable({
   const {
     attributes,
     isDragging,
-    isOver,
     listeners,
     setActivatorNodeRef,
     setNodeRef,
@@ -75,14 +68,8 @@ export function useSidebarSortable({
     [isDragging, transform, transition],
   );
   const dragBindings = useMemo<SidebarSortableDragBindings>(
-    () => ({
-      attributes,
-      disabled,
-      isOver,
-      listeners,
-      setActivatorNodeRef,
-    }),
-    [attributes, disabled, isOver, listeners, setActivatorNodeRef],
+    () => ({ attributes, disabled, listeners, setActivatorNodeRef }),
+    [attributes, disabled, listeners, setActivatorNodeRef],
   );
 
   return { dragBindings, setNodeRef, style };

From fce12a1e020b579ed9c2b6066be208780aa326c1 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:04:01 -0700
Subject: [PATCH 25/54] Polish sidebar display tooltips

---
 apps/app/src/components/sidebar/ProjectList.tsx              | 4 +++-
 apps/app/src/components/sidebar/ProjectRow.tsx               | 4 ----
 .../app/src/components/sidebar/SidebarChildToggleChevron.tsx | 5 -----
 apps/app/src/components/sidebar/SidebarFolderRow.tsx         | 2 --
 apps/app/src/components/sidebar/ThreadRow.tsx                | 2 --
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 877aead3a..2a7d74d50 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -588,7 +588,9 @@ export function SidebarViewOptionsMenu({
             </Button>
           </DropdownMenuTrigger>
         </TooltipTrigger>
-        <TooltipContent side="bottom">Sidebar display options</TooltipContent>
+        <TooltipContent side="bottom" className="px-2 py-1">
+          Display
+        </TooltipContent>
       </Tooltip>
       <DropdownMenuContent
         align="end"
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 4fff61b1d..225c3cd89 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -1076,8 +1076,6 @@ function EnvironmentThreadGroupHeader({
           isCollapsed={isCollapsed}
           expandLabel={`Expand ${displayName} threads`}
           collapseLabel={`Collapse ${displayName} threads`}
-          expandTitle="Expand worktree threads"
-          collapseTitle="Collapse worktree threads"
           onToggle={() => onToggleCollapsed(environmentId)}
           revealOnHover
         />
@@ -2002,8 +2000,6 @@ function ProjectRowComponent({
                 isCollapsed={isCollapsed}
                 expandLabel={`Expand ${project.name}`}
                 collapseLabel={`Collapse ${project.name}`}
-                expandTitle="Expand project threads"
-                collapseTitle="Collapse project threads"
                 onToggle={handleProjectRowToggle}
                 revealOnHover
               />
diff --git a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
index 55b7a1799..e375723d1 100644
--- a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
+++ b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
@@ -8,8 +8,6 @@ export interface SidebarChildToggleChevronProps {
   isCollapsed: boolean;
   expandLabel: string;
   collapseLabel: string;
-  expandTitle: string;
-  collapseTitle: string;
   onToggle: SidebarChildToggleHandler;
   revealOnHover?: boolean;
 }
@@ -18,8 +16,6 @@ export function SidebarChildToggleChevron({
   isCollapsed,
   expandLabel,
   collapseLabel,
-  expandTitle,
-  collapseTitle,
   onToggle,
   revealOnHover = false,
 }: SidebarChildToggleChevronProps) {
@@ -28,7 +24,6 @@ export function SidebarChildToggleChevron({
       type="button"
       aria-expanded={!isCollapsed}
       aria-label={isCollapsed ? expandLabel : collapseLabel}
-      title={isCollapsed ? expandTitle : collapseTitle}
       onClick={(event) => {
         event.preventDefault();
         event.stopPropagation();
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index 833e8a344..9dcf42fd0 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -150,8 +150,6 @@ function SidebarFolderRowComponent({
           isCollapsed={isCollapsed}
           expandLabel={`Expand ${pathLabel} folder`}
           collapseLabel={`Collapse ${pathLabel} folder`}
-          expandTitle="Expand folder"
-          collapseTitle="Collapse folder"
           onToggle={onToggleCollapsed}
         />
       </span>
diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index fa2ddf667..b2e931879 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -349,8 +349,6 @@ function ThreadRowComponent({
             isCollapsed={isParentCollapsed}
             expandLabel={`Expand ${threadTitle} threads`}
             collapseLabel={`Collapse ${threadTitle} threads`}
-            expandTitle="Expand child threads"
-            collapseTitle="Collapse child threads"
             onToggle={() => parentOptions.onToggleCollapsed(thread.id)}
             revealOnHover
           />

From 36609c8f5c4f48cc6b7e014a655c06addcdc8e01 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:09:23 -0700
Subject: [PATCH 26/54] Make sidebar thread dragging feel lighter

---
 apps/app/src/components/sidebar/ThreadRow.tsx | 67 +++++++++++++++----
 .../src/components/sidebar/sortableMotion.ts  |  3 +-
 .../sidebar/useSidebarReorderDnd.ts           | 12 ++++
 3 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index b2e931879..e5917621b 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -9,6 +9,7 @@ import {
 import { useSetAtom } from "jotai";
 import type { ThreadListEntry } from "@bb/domain";
 import { getThreadConversationCollapsedAtom } from "@/components/secondary-panel/threadSecondaryPanelAtoms";
+import { Button } from "@/components/ui/button.js";
 import { Icon } from "@/components/ui/icon.js";
 import { SidebarStickyTier } from "@/components/ui/sidebar.js";
 import { NavLink } from "react-router-dom";
@@ -95,12 +96,16 @@ type ThreadRowClickCaptureHandler = MouseEventHandler<HTMLDivElement>;
 interface ThreadRowContainerArgs {
   children: ReactNode;
   className: string;
-  dragBindings?: SidebarSortableDragBindings;
   onClickCapture?: ThreadRowClickCaptureHandler;
   stickyLevel?: number;
   style: CSSProperties;
 }
 
+interface ThreadDragHandleProps {
+  dragBindings: SidebarSortableDragBindings;
+  label: string;
+}
+
 function ThreadDraftIndicator() {
   return (
     <Icon
@@ -120,7 +125,6 @@ function getThreadRowStyle(depth: number): CSSProperties {
 function renderThreadRowContainer({
   children,
   className,
-  dragBindings,
   onClickCapture,
   stickyLevel,
   style,
@@ -128,13 +132,10 @@ function renderThreadRowContainer({
   if (stickyLevel !== undefined) {
     return (
       <SidebarStickyTier
-        ref={dragBindings?.setActivatorNodeRef}
         tier="parent"
         level={stickyLevel}
         className={className}
         style={style}
-        {...dragBindings?.attributes}
-        {...(dragBindings?.listeners ?? {})}
         onClickCapture={onClickCapture}
       >
         {children}
@@ -143,19 +144,51 @@ function renderThreadRowContainer({
   }
 
   return (
-    <div
-      ref={dragBindings?.setActivatorNodeRef}
-      className={className}
-      style={style}
-      {...dragBindings?.attributes}
-      {...(dragBindings?.listeners ?? {})}
-      onClickCapture={onClickCapture}
-    >
+    <div className={className} style={style} onClickCapture={onClickCapture}>
       {children}
     </div>
   );
 }
 
+function ThreadDragHandle({ dragBindings, label }: ThreadDragHandleProps) {
+  const handleClick = useCallback<MouseEventHandler<HTMLButtonElement>>(
+    (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    [],
+  );
+
+  return (
+    <Button
+      ref={dragBindings.setActivatorNodeRef}
+      type="button"
+      variant="ghost"
+      size="icon"
+      aria-label={label}
+      title={undefined}
+      disabled={dragBindings.disabled}
+      className={cn(
+        "relative z-10 -ml-1.5 -mr-2 h-7 w-5 shrink-0 rounded-md p-0 text-muted-foreground hover:bg-transparent hover:text-foreground max-md:pointer-coarse:-ml-1 max-md:pointer-coarse:-mr-1 max-md:pointer-coarse:h-9 max-md:pointer-coarse:w-7",
+        !dragBindings.disabled && "cursor-grab active:cursor-grabbing",
+      )}
+      {...dragBindings.attributes}
+      {...dragBindings.listeners}
+      onClick={handleClick}
+    >
+      <Icon
+        name="DragDropVertical"
+        className={cn(
+          "size-3.5 shrink-0 opacity-0 transition-opacity",
+          !dragBindings.disabled &&
+            "group-hover/thread-row:opacity-100 group-focus-within/thread-row:opacity-100",
+        )}
+        aria-hidden="true"
+      />
+    </Button>
+  );
+}
+
 interface ThreadStatusGlyphProps {
   hasPendingInteraction: boolean;
   isBusy: boolean;
@@ -302,6 +335,7 @@ function ThreadRowComponent({
     : `Open ${labelTitle}`;
   const linkTitle = linkLabel;
   const rowDragBindings = options.dragBindings;
+  const showDragHandle = Boolean(rowDragBindings && !rowDragBindings.disabled);
   const rowClassName = cn(
     SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
     "group/thread-row",
@@ -342,6 +376,12 @@ function ThreadRowComponent({
         title={linkTitle}
         className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
       />
+      {showDragHandle && rowDragBindings ? (
+        <ThreadDragHandle
+          dragBindings={rowDragBindings}
+          label={`Move ${labelTitle}`}
+        />
+      ) : null}
       <span className="flex min-w-0 flex-1 items-center gap-1.5">
         <span className="min-w-0 truncate">{visibleTitle}</span>
         {parentOptions && hasChildren ? (
@@ -405,7 +445,6 @@ function ThreadRowComponent({
   const row = renderThreadRowContainer({
     children: rowContent,
     className: rowClassName,
-    dragBindings: rowDragBindings,
     onClickCapture: options.consumeClickSuppression
       ? handleRowClickCapture
       : undefined,
diff --git a/apps/app/src/components/sidebar/sortableMotion.ts b/apps/app/src/components/sidebar/sortableMotion.ts
index 5b2e9a739..a1afd1db0 100644
--- a/apps/app/src/components/sidebar/sortableMotion.ts
+++ b/apps/app/src/components/sidebar/sortableMotion.ts
@@ -20,7 +20,7 @@ export interface SidebarSortableDragBindings {
   attributes: DraggableAttributes;
   disabled: boolean;
   listeners: DraggableSyntheticListeners;
-  setActivatorNodeRef: (element: HTMLDivElement | null) => void;
+  setActivatorNodeRef: (element: HTMLElement | null) => void;
 }
 
 export interface UseSidebarSortableArgs {
@@ -64,6 +64,7 @@ export function useSidebarSortable({
       // unless we lift it above them while dragging.
       position: isDragging ? "relative" : undefined,
       zIndex: isDragging ? 20 : undefined,
+      opacity: isDragging ? 0.8 : undefined,
     }),
     [isDragging, transform, transition],
   );
diff --git a/apps/app/src/components/sidebar/useSidebarReorderDnd.ts b/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
index 0d41ba925..4ec9a2d91 100644
--- a/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
+++ b/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
@@ -11,6 +11,7 @@ import {
   type DndContextProps,
   type DragEndEvent,
   type DragStartEvent,
+  type Modifier,
 } from "@dnd-kit/core";
 import { sortableKeyboardCoordinates } from "@dnd-kit/sortable";
 import {
@@ -31,6 +32,15 @@ const sidebarReorderCollisionDetection: CollisionDetection = (args) => {
   return pointerCollisions.length > 0 ? pointerCollisions : closestCenter(args);
 };
 
+const restrictSidebarDragToVerticalAxis: Modifier = ({ transform }) => ({
+  ...transform,
+  x: 0,
+});
+
+const SIDEBAR_REORDER_MODIFIERS: Modifier[] = [
+  restrictSidebarDragToVerticalAxis,
+];
+
 export interface UseSidebarReorderDndArgs {
   /**
    * Performs the reorder once a drag settles. The hook clears the drag-click
@@ -46,6 +56,7 @@ export type SidebarReorderDndContextProps = Pick<
   | "onDragStart"
   | "onDragCancel"
   | "onDragEnd"
+  | "modifiers"
 >;
 
 export interface UseSidebarReorderDndResult {
@@ -113,6 +124,7 @@ export function useSidebarReorderDnd({
     () => ({
       sensors,
       collisionDetection: sidebarReorderCollisionDetection,
+      modifiers: SIDEBAR_REORDER_MODIFIERS,
       onDragStart: handleDragStart,
       onDragCancel: handleDragCancel,
       onDragEnd: handleDragEnd,

From 80c18bafeaf58db613f8fa8233c24684a6a23674 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:13:30 -0700
Subject: [PATCH 27/54] Restore row-level thread folder dragging

---
 apps/app/src/components/sidebar/ThreadRow.tsx | 67 ++++---------------
 1 file changed, 14 insertions(+), 53 deletions(-)

diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index e5917621b..b2e931879 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -9,7 +9,6 @@ import {
 import { useSetAtom } from "jotai";
 import type { ThreadListEntry } from "@bb/domain";
 import { getThreadConversationCollapsedAtom } from "@/components/secondary-panel/threadSecondaryPanelAtoms";
-import { Button } from "@/components/ui/button.js";
 import { Icon } from "@/components/ui/icon.js";
 import { SidebarStickyTier } from "@/components/ui/sidebar.js";
 import { NavLink } from "react-router-dom";
@@ -96,16 +95,12 @@ type ThreadRowClickCaptureHandler = MouseEventHandler<HTMLDivElement>;
 interface ThreadRowContainerArgs {
   children: ReactNode;
   className: string;
+  dragBindings?: SidebarSortableDragBindings;
   onClickCapture?: ThreadRowClickCaptureHandler;
   stickyLevel?: number;
   style: CSSProperties;
 }
 
-interface ThreadDragHandleProps {
-  dragBindings: SidebarSortableDragBindings;
-  label: string;
-}
-
 function ThreadDraftIndicator() {
   return (
     <Icon
@@ -125,6 +120,7 @@ function getThreadRowStyle(depth: number): CSSProperties {
 function renderThreadRowContainer({
   children,
   className,
+  dragBindings,
   onClickCapture,
   stickyLevel,
   style,
@@ -132,10 +128,13 @@ function renderThreadRowContainer({
   if (stickyLevel !== undefined) {
     return (
       <SidebarStickyTier
+        ref={dragBindings?.setActivatorNodeRef}
         tier="parent"
         level={stickyLevel}
         className={className}
         style={style}
+        {...dragBindings?.attributes}
+        {...(dragBindings?.listeners ?? {})}
         onClickCapture={onClickCapture}
       >
         {children}
@@ -144,51 +143,19 @@ function renderThreadRowContainer({
   }
 
   return (
-    <div className={className} style={style} onClickCapture={onClickCapture}>
+    <div
+      ref={dragBindings?.setActivatorNodeRef}
+      className={className}
+      style={style}
+      {...dragBindings?.attributes}
+      {...(dragBindings?.listeners ?? {})}
+      onClickCapture={onClickCapture}
+    >
       {children}
     </div>
   );
 }
 
-function ThreadDragHandle({ dragBindings, label }: ThreadDragHandleProps) {
-  const handleClick = useCallback<MouseEventHandler<HTMLButtonElement>>(
-    (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-    },
-    [],
-  );
-
-  return (
-    <Button
-      ref={dragBindings.setActivatorNodeRef}
-      type="button"
-      variant="ghost"
-      size="icon"
-      aria-label={label}
-      title={undefined}
-      disabled={dragBindings.disabled}
-      className={cn(
-        "relative z-10 -ml-1.5 -mr-2 h-7 w-5 shrink-0 rounded-md p-0 text-muted-foreground hover:bg-transparent hover:text-foreground max-md:pointer-coarse:-ml-1 max-md:pointer-coarse:-mr-1 max-md:pointer-coarse:h-9 max-md:pointer-coarse:w-7",
-        !dragBindings.disabled && "cursor-grab active:cursor-grabbing",
-      )}
-      {...dragBindings.attributes}
-      {...dragBindings.listeners}
-      onClick={handleClick}
-    >
-      <Icon
-        name="DragDropVertical"
-        className={cn(
-          "size-3.5 shrink-0 opacity-0 transition-opacity",
-          !dragBindings.disabled &&
-            "group-hover/thread-row:opacity-100 group-focus-within/thread-row:opacity-100",
-        )}
-        aria-hidden="true"
-      />
-    </Button>
-  );
-}
-
 interface ThreadStatusGlyphProps {
   hasPendingInteraction: boolean;
   isBusy: boolean;
@@ -335,7 +302,6 @@ function ThreadRowComponent({
     : `Open ${labelTitle}`;
   const linkTitle = linkLabel;
   const rowDragBindings = options.dragBindings;
-  const showDragHandle = Boolean(rowDragBindings && !rowDragBindings.disabled);
   const rowClassName = cn(
     SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
     "group/thread-row",
@@ -376,12 +342,6 @@ function ThreadRowComponent({
         title={linkTitle}
         className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
       />
-      {showDragHandle && rowDragBindings ? (
-        <ThreadDragHandle
-          dragBindings={rowDragBindings}
-          label={`Move ${labelTitle}`}
-        />
-      ) : null}
       <span className="flex min-w-0 flex-1 items-center gap-1.5">
         <span className="min-w-0 truncate">{visibleTitle}</span>
         {parentOptions && hasChildren ? (
@@ -445,6 +405,7 @@ function ThreadRowComponent({
   const row = renderThreadRowContainer({
     children: rowContent,
     className: rowClassName,
+    dragBindings: rowDragBindings,
     onClickCapture: options.consumeClickSuppression
       ? handleRowClickCapture
       : undefined,

From 5f6839e097a0c15921cd3f4151e32d8786fda254 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:16:47 -0700
Subject: [PATCH 28/54] Use icon button for new thread action

---
 apps/app/src/components/sidebar/ProjectList.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 2a7d74d50..be33815d2 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -962,17 +962,18 @@ export function ProjectListActionButtons({
         <div className="flex min-w-0 items-center gap-1">
           <Button
             type="button"
-            size="sm"
+            size="icon"
             variant="ghost"
-            className={cn(PROJECT_LIST_ACTION_BUTTON_CLASS, "flex-1")}
+            className={PROJECT_LIST_ACTION_ICON_BUTTON_CLASS}
             onClick={onNewChat}
             disabled={isNewChatDisabled}
+            aria-label={newChatTitle}
             title={newChatTitle}
           >
-            <Icon name="MessageSquarePlus" />
-            <span className="min-w-0 flex-1 truncate text-left">
-              New thread
-            </span>
+            <Icon
+              name="MessageSquarePlus"
+              className={COARSE_POINTER_ICON_SIZE_CLASS}
+            />
           </Button>
           {threadSearch ? (
             <Button

From 49c4a665936eda2048e1b96b8e72060d155c6f71 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 03:26:01 -0700
Subject: [PATCH 29/54] Split sidebar organize and sort menus

---
 .../src/components/sidebar/ProjectList.tsx    | 434 ++++++++++++++----
 .../SidebarViewOptionsMenu.stories.tsx        |  27 +-
 .../components/sidebar/projectThreadGroups.ts |  23 +-
 .../sidebar/sidebarCollapsedAtoms.ts          |  15 +-
 4 files changed, 404 insertions(+), 95 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index be33815d2..e4fce1ac7 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -50,6 +50,7 @@ import {
   getProjectlessArchivedRoutePath,
   getRootComposeRoutePath,
 } from "@/lib/route-paths";
+import { getThreadDisplayTitle } from "@/lib/thread-title";
 import {
   applyNeighborReorder,
   buildNeighborReorderRequest,
@@ -87,6 +88,7 @@ import type { ProjectThreadListState } from "./ProjectRow";
 import {
   compareByCreatedAtDescending,
   compareStandardThreads,
+  type ProjectThreadItem,
   type ThreadComparator,
 } from "./projectThreadGroups";
 import {
@@ -109,9 +111,12 @@ import {
   sidebarCollapsedFoldersAtom,
   sidebarOrganizationModeAtom,
   sidebarSectionOrderAtom,
+  sidebarSortDirectionAtom,
+  type SidebarChronologicalSort,
   type CollapsibleSidebarSectionId,
   type SidebarOrganizationMode,
   type SidebarSectionId,
+  type SidebarSortDirection,
 } from "./sidebarCollapsedAtoms";
 import { folderAncestorKeys } from "./folderPath";
 import { CHRONOLOGICAL_CONTAINER_ID } from "./projectThreadGroups";
@@ -120,7 +125,6 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuLabel,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import {
@@ -194,12 +198,17 @@ interface ProjectListThreadsSectionActionsProps {
   onNewThread: () => void;
 }
 
-interface SidebarViewOptionsMenuProps {
+interface SidebarOrganizeOptionsMenuProps {
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
 }
 
+interface SidebarSortOptionsMenuProps {
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+}
+
 interface SidebarThreadActionsMenuProps {
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
@@ -263,6 +272,7 @@ type ToggleCollapsedId = (id: string) => void;
 type ToggleCollapsedSidebarSectionId = (
   id: CollapsibleSidebarSectionId,
 ) => void;
+type SidebarDisplayOptionsMenuKind = "organize" | "sort";
 
 interface TopLevelSidebarSectionProps {
   label: string;
@@ -419,6 +429,97 @@ function uniqueFolderPaths(
   return Array.from(paths).sort((left, right) => left.localeCompare(right));
 }
 
+function compareByTitleAscending(
+  left: ThreadListEntry,
+  right: ThreadListEntry,
+): number {
+  const titleDelta = getThreadDisplayTitle(left).localeCompare(
+    getThreadDisplayTitle(right),
+  );
+  if (titleDelta !== 0) {
+    return titleDelta;
+  }
+
+  return left.id.localeCompare(right.id);
+}
+
+function getProjectThreadItemAlphaLabel(item: ProjectThreadItem): string {
+  switch (item.kind) {
+    case "thread":
+      return getThreadDisplayTitle(item.node.thread);
+    case "environment":
+      return getThreadDisplayTitle(item.group.nodes[0].thread);
+    case "folder":
+      return item.group.path.join("/");
+  }
+}
+
+function compareProjectThreadItemsByTitleAscending(
+  left: ProjectThreadItem,
+  right: ProjectThreadItem,
+): number {
+  const labelDelta = getProjectThreadItemAlphaLabel(left).localeCompare(
+    getProjectThreadItemAlphaLabel(right),
+  );
+  if (labelDelta !== 0) {
+    return labelDelta;
+  }
+
+  const kindDelta = left.kind.localeCompare(right.kind);
+  if (kindDelta !== 0) {
+    return kindDelta;
+  }
+
+  return left.kind === "folder" && right.kind === "folder"
+    ? left.group.key.localeCompare(right.group.key)
+    : 0;
+}
+
+function invertNumber(value: number): number {
+  return value === 0 ? 0 : -value;
+}
+
+function invertThreadComparator(
+  compareThreads: ThreadComparator,
+): ThreadComparator {
+  return (left, right) => {
+    const result = compareThreads(left, right);
+    return invertNumber(result);
+  };
+}
+
+function getSidebarThreadComparator({
+  direction,
+  sort,
+}: {
+  direction: SidebarSortDirection;
+  sort: SidebarChronologicalSort;
+}): ThreadComparator {
+  const normalizedSort = sort === "none" ? "updated" : sort;
+  const baseComparator: ThreadComparator =
+    normalizedSort === "created"
+      ? compareByCreatedAtDescending
+      : normalizedSort === "alpha"
+        ? compareByTitleAscending
+        : compareStandardThreads;
+  const compareItems =
+    normalizedSort === "alpha"
+      ? compareProjectThreadItemsByTitleAscending
+      : undefined;
+  const comparator: ThreadComparator =
+    direction === "asc"
+      ? invertThreadComparator(baseComparator)
+      : baseComparator;
+  if (compareItems) {
+    comparator.compareItems =
+      direction === "asc"
+        ? compareItems
+        : (left, right) => invertNumber(compareItems(left, right));
+  }
+
+  return comparator;
+}
+
 function ProjectListSectionIconButton({
   ariaLabel,
   disabled = false,
@@ -552,50 +653,156 @@ function SidebarOrganizeMenuOption({
   );
 }
 
-// Shared display menu rendered on both the Projects and Threads section
+interface SidebarSortMenuOptionProps {
+  direction: SidebarSortDirection;
+  label: string;
+  selected: boolean;
+  sort: SidebarChronologicalSort;
+  onDirectionSelect: (
+    sort: SidebarChronologicalSort,
+    direction: SidebarSortDirection,
+  ) => void;
+  onSortSelect: (sort: SidebarChronologicalSort) => void;
+}
+
+function SidebarDisplayMenuTrigger({
+  ariaLabel,
+  iconName,
+  tooltip,
+}: {
+  ariaLabel: string;
+  iconName: IconName;
+  tooltip: string;
+}) {
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <DropdownMenuTrigger asChild>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            aria-label={ariaLabel}
+            title={undefined}
+            className={cn(
+              "rounded-md p-0 text-muted-foreground",
+              "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
+              COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+            )}
+          >
+            <Icon name={iconName} className={COARSE_POINTER_ICON_SIZE_CLASS} />
+          </Button>
+        </DropdownMenuTrigger>
+      </TooltipTrigger>
+      <TooltipContent side="bottom" className="px-2 py-1">
+        {tooltip}
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+function SidebarSortDirectionButton({
+  active,
+  ariaLabel,
+  direction,
+  onClick,
+}: {
+  active: boolean;
+  ariaLabel: string;
+  direction: SidebarSortDirection;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      aria-label={ariaLabel}
+      aria-pressed={active}
+      onPointerDown={(event) => {
+        event.stopPropagation();
+      }}
+      onClick={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        onClick();
+      }}
+      className={cn(
+        "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-subtle-foreground transition-colors hover:bg-sidebar-accent hover:text-sidebar-foreground",
+        active && "bg-sidebar-accent text-sidebar-foreground",
+      )}
+    >
+      <Icon
+        name={direction === "asc" ? "ArrowUp" : "ArrowDown"}
+        className="size-3"
+      />
+    </button>
+  );
+}
+
+function SidebarSortMenuOption({
+  direction,
+  label,
+  selected,
+  sort,
+  onDirectionSelect,
+  onSortSelect,
+}: SidebarSortMenuOptionProps) {
+  return (
+    <DropdownMenuItem
+      onSelect={(event) => {
+        event.preventDefault();
+        onSortSelect(sort);
+      }}
+      className="flex items-center gap-2"
+    >
+      <span className="min-w-0 flex-1 truncate text-xs">{label}</span>
+      <Icon
+        name="Check"
+        className={cn(
+          COARSE_POINTER_ICON_SIZE_CLASS,
+          selected ? "opacity-100" : "opacity-0",
+        )}
+      />
+      <span className="flex shrink-0 items-center gap-0.5">
+        <SidebarSortDirectionButton
+          active={selected && direction === "asc"}
+          ariaLabel={`Sort ${label} ascending`}
+          direction="asc"
+          onClick={() => onDirectionSelect(sort, "asc")}
+        />
+        <SidebarSortDirectionButton
+          active={selected && direction === "desc"}
+          ariaLabel={`Sort ${label} descending`}
+          direction="desc"
+          onClick={() => onDirectionSelect(sort, "desc")}
+        />
+      </span>
+    </DropdownMenuItem>
+  );
+}
+
+// Shared organization menu rendered on both the Projects and Threads section
 // headers. The organization mode is global, so either header's menu drives the
 // whole sidebar.
-export function SidebarViewOptionsMenu({
+export function SidebarOrganizeOptionsMenu({
   open,
   onOpenChange,
   onOrganizationModeSelect,
-}: SidebarViewOptionsMenuProps) {
+}: SidebarOrganizeOptionsMenuProps) {
   const [organizationMode, setOrganizationMode] = useAtom(
     sidebarOrganizationModeAtom,
   );
-  const [chronologicalSort, setChronologicalSort] = useAtom(
-    sidebarChronologicalSortAtom,
-  );
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <DropdownMenuTrigger asChild>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon"
-              aria-label="Sidebar display options"
-              title={undefined}
-              className={cn(
-                "rounded-md p-0 text-muted-foreground",
-                "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
-                COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-              )}
-            >
-              <Icon name="Sort" className={COARSE_POINTER_ICON_SIZE_CLASS} />
-            </Button>
-          </DropdownMenuTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="bottom" className="px-2 py-1">
-          Display
-        </TooltipContent>
-      </Tooltip>
+      <SidebarDisplayMenuTrigger
+        ariaLabel="Sidebar organization options"
+        iconName="GridView"
+        tooltip="Organize"
+      />
       <DropdownMenuContent
         align="end"
         className="w-52"
-        mobileTitle="Sidebar display options"
+        mobileTitle="Organize sidebar"
       >
         <SidebarOrganizeMenuSectionLabel className="pt-1.5">
           Organize by
@@ -618,25 +825,69 @@ export function SidebarViewOptionsMenu({
             onOrganizationModeSelect?.("chronological");
           }}
         />
-        <DropdownMenuSeparator />
-        <SidebarOrganizeMenuSectionLabel className="pt-2">
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+export function SidebarSortOptionsMenu({
+  open,
+  onOpenChange,
+}: SidebarSortOptionsMenuProps) {
+  const [chronologicalSort, setChronologicalSort] = useAtom(
+    sidebarChronologicalSortAtom,
+  );
+  const [sortDirection, setSortDirection] = useAtom(sidebarSortDirectionAtom);
+  const selectedSort: SidebarChronologicalSort =
+    chronologicalSort === "none" ? "updated" : chronologicalSort;
+  const handleSortSelect = useCallback(
+    (sort: SidebarChronologicalSort) => {
+      setChronologicalSort(sort);
+    },
+    [setChronologicalSort],
+  );
+  const handleDirectionSelect = useCallback(
+    (sort: SidebarChronologicalSort, direction: SidebarSortDirection) => {
+      setChronologicalSort(sort);
+      setSortDirection(direction);
+    },
+    [setChronologicalSort, setSortDirection],
+  );
+
+  return (
+    <DropdownMenu open={open} onOpenChange={onOpenChange}>
+      <SidebarDisplayMenuTrigger
+        ariaLabel="Sidebar sort options"
+        iconName="Sort"
+        tooltip="Sort"
+      />
+      <DropdownMenuContent align="end" className="w-56" mobileTitle="Sort">
+        <SidebarOrganizeMenuSectionLabel className="pt-1.5">
           Sort by
         </SidebarOrganizeMenuSectionLabel>
-        <SidebarOrganizeMenuOption
+        <SidebarSortMenuOption
           label="Updated at"
-          selected={chronologicalSort === "updated"}
-          onSelect={(event) => {
-            event.preventDefault();
-            setChronologicalSort("updated");
-          }}
+          sort="updated"
+          selected={selectedSort === "updated"}
+          direction={sortDirection}
+          onSortSelect={handleSortSelect}
+          onDirectionSelect={handleDirectionSelect}
         />
-        <SidebarOrganizeMenuOption
+        <SidebarSortMenuOption
           label="Created at"
-          selected={chronologicalSort === "created"}
-          onSelect={(event) => {
-            event.preventDefault();
-            setChronologicalSort("created");
-          }}
+          sort="created"
+          selected={selectedSort === "created"}
+          direction={sortDirection}
+          onSortSelect={handleSortSelect}
+          onDirectionSelect={handleDirectionSelect}
+        />
+        <SidebarSortMenuOption
+          label="Alphabetical"
+          sort="alpha"
+          selected={selectedSort === "alpha"}
+          direction={sortDirection}
+          onSortSelect={handleSortSelect}
+          onDirectionSelect={handleDirectionSelect}
         />
       </DropdownMenuContent>
     </DropdownMenu>
@@ -1263,18 +1514,18 @@ function ProjectListComponent({
   const [sidebarSectionOrderList, setSidebarSectionOrderList] = useAtom(
     sidebarSectionOrderAtom,
   );
-  const [isProjectsViewOptionsMenuOpen, setIsProjectsViewOptionsMenuOpen] =
-    useState(false);
+  const [projectsDisplayOptionsMenuOpen, setProjectsDisplayOptionsMenuOpen] =
+    useState<SidebarDisplayOptionsMenuKind | null>(null);
   const [isThreadsActionsMenuOpen, setIsThreadsActionsMenuOpen] =
     useState(false);
-  const [isThreadsViewOptionsMenuOpen, setIsThreadsViewOptionsMenuOpen] =
-    useState(false);
-  const handleProjectsViewOptionsMenuOpenChange = useCallback(
-    (open: boolean) => {
-      setIsProjectsViewOptionsMenuOpen(open);
+  const [threadsDisplayOptionsMenuOpen, setThreadsDisplayOptionsMenuOpen] =
+    useState<SidebarDisplayOptionsMenuKind | null>(null);
+  const handleProjectsDisplayOptionsMenuOpenChange = useCallback(
+    (menu: SidebarDisplayOptionsMenuKind, open: boolean) => {
+      setProjectsDisplayOptionsMenuOpen(open ? menu : null);
       if (open) {
         setIsThreadsActionsMenuOpen(false);
-        setIsThreadsViewOptionsMenuOpen(false);
+        setThreadsDisplayOptionsMenuOpen(null);
       }
     },
     [],
@@ -1282,15 +1533,15 @@ function ProjectListComponent({
   const handleThreadsActionsMenuOpenChange = useCallback((open: boolean) => {
     setIsThreadsActionsMenuOpen(open);
     if (open) {
-      setIsProjectsViewOptionsMenuOpen(false);
-      setIsThreadsViewOptionsMenuOpen(false);
+      setProjectsDisplayOptionsMenuOpen(null);
+      setThreadsDisplayOptionsMenuOpen(null);
     }
   }, []);
-  const handleThreadsViewOptionsMenuOpenChange = useCallback(
-    (open: boolean) => {
-      setIsThreadsViewOptionsMenuOpen(open);
+  const handleThreadsDisplayOptionsMenuOpenChange = useCallback(
+    (menu: SidebarDisplayOptionsMenuKind, open: boolean) => {
+      setThreadsDisplayOptionsMenuOpen(open ? menu : null);
       if (open) {
-        setIsProjectsViewOptionsMenuOpen(false);
+        setProjectsDisplayOptionsMenuOpen(null);
         setIsThreadsActionsMenuOpen(false);
       }
     },
@@ -1299,9 +1550,9 @@ function ProjectListComponent({
   const handleProjectsViewOptionsOrganizationModeSelect = useCallback(
     (mode: SidebarOrganizationMode) => {
       if (mode === "chronological") {
-        setIsProjectsViewOptionsMenuOpen(false);
+        setProjectsDisplayOptionsMenuOpen(null);
         setIsThreadsActionsMenuOpen(false);
-        setIsThreadsViewOptionsMenuOpen(true);
+        setThreadsDisplayOptionsMenuOpen("organize");
       }
     },
     [],
@@ -1310,14 +1561,16 @@ function ProjectListComponent({
   const [chronologicalSort, setChronologicalSort] = useAtom(
     sidebarChronologicalSortAtom,
   );
+  const [sortDirection] = useAtom(sidebarSortDirectionAtom);
   const isFolderOrganizationMode = organizationMode === "chronological";
   const setCollapsedFolderList = useSetAtom(sidebarCollapsedFoldersAtom);
   const sidebarThreadComparator = useMemo<ThreadComparator>(
     () =>
-      chronologicalSort === "created"
-        ? compareByCreatedAtDescending
-        : compareStandardThreads,
-    [chronologicalSort],
+      getSidebarThreadComparator({
+        direction: sortDirection,
+        sort: chronologicalSort,
+      }),
+    [chronologicalSort, sortDirection],
   );
   const collapsedProjectIds = useMemo(
     () => new Set(collapsedProjectIdList),
@@ -1686,13 +1939,21 @@ function ProjectListComponent({
   );
   const projectsSectionActions = (
     <>
-      <SidebarViewOptionsMenu
-        open={isProjectsViewOptionsMenuOpen}
-        onOpenChange={handleProjectsViewOptionsMenuOpenChange}
+      <SidebarOrganizeOptionsMenu
+        open={projectsDisplayOptionsMenuOpen === "organize"}
+        onOpenChange={(open) =>
+          handleProjectsDisplayOptionsMenuOpenChange("organize", open)
+        }
         onOrganizationModeSelect={
           handleProjectsViewOptionsOrganizationModeSelect
         }
       />
+      <SidebarSortOptionsMenu
+        open={projectsDisplayOptionsMenuOpen === "sort"}
+        onOpenChange={(open) =>
+          handleProjectsDisplayOptionsMenuOpenChange("sort", open)
+        }
+      />
       {onNewProject ? (
         <ProjectListProjectsSectionActions
           onNewProject={onNewProject}
@@ -1705,9 +1966,17 @@ function ProjectListComponent({
     projectsState.status === "ready" && renderedProjects.length === 0;
   const folderSectionActions = (
     <>
-      <SidebarViewOptionsMenu
-        open={isThreadsViewOptionsMenuOpen}
-        onOpenChange={handleThreadsViewOptionsMenuOpenChange}
+      <SidebarOrganizeOptionsMenu
+        open={threadsDisplayOptionsMenuOpen === "organize"}
+        onOpenChange={(open) =>
+          handleThreadsDisplayOptionsMenuOpenChange("organize", open)
+        }
+      />
+      <SidebarSortOptionsMenu
+        open={threadsDisplayOptionsMenuOpen === "sort"}
+        onOpenChange={(open) =>
+          handleThreadsDisplayOptionsMenuOpenChange("sort", open)
+        }
       />
       <ProjectListSectionIconButton
         ariaLabel="New folder"
@@ -1738,9 +2007,17 @@ function ProjectListComponent({
         onOpenChange={handleThreadsActionsMenuOpenChange}
         onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
       />
-      <SidebarViewOptionsMenu
-        open={isThreadsViewOptionsMenuOpen}
-        onOpenChange={handleThreadsViewOptionsMenuOpenChange}
+      <SidebarOrganizeOptionsMenu
+        open={threadsDisplayOptionsMenuOpen === "organize"}
+        onOpenChange={(open) =>
+          handleThreadsDisplayOptionsMenuOpenChange("organize", open)
+        }
+      />
+      <SidebarSortOptionsMenu
+        open={threadsDisplayOptionsMenuOpen === "sort"}
+        onOpenChange={(open) =>
+          handleThreadsDisplayOptionsMenuOpenChange("sort", open)
+        }
       />
       <ProjectListThreadsSectionActions
         isCreatingFolder={isCreateThreadFolderPending}
@@ -1766,7 +2043,7 @@ function ProjectListComponent({
         <TopLevelSidebarSection
           label="Folders"
           actions={folderSectionActions}
-          actionsOpen={isThreadsViewOptionsMenuOpen}
+          actionsOpen={threadsDisplayOptionsMenuOpen !== null}
           actionsMobileAlways
         >
           {content}
@@ -1875,7 +2152,7 @@ function ProjectListComponent({
                   label="Projects"
                   disabled={visibleSidebarSectionOrder.length < 2}
                   actions={projectsSectionActions}
-                  actionsOpen={isProjectsViewOptionsMenuOpen}
+                  actionsOpen={projectsDisplayOptionsMenuOpen !== null}
                   actionsAlwaysVisible={projectsSectionActionsAlwaysVisible}
                   collapseControl={{
                     isCollapsed: collapsedSidebarSectionIds.has("projects"),
@@ -1896,7 +2173,8 @@ function ProjectListComponent({
                   disabled={visibleSidebarSectionOrder.length < 2}
                   actions={threadsSectionActions}
                   actionsOpen={
-                    isThreadsActionsMenuOpen || isThreadsViewOptionsMenuOpen
+                    isThreadsActionsMenuOpen ||
+                    threadsDisplayOptionsMenuOpen !== null
                   }
                   actionsMobileAlways
                   collapseControl={{
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 0aa81ff8a..0d1b82f2d 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -1,10 +1,15 @@
 import { useMemo } from "react";
 import { createStore, Provider as JotaiProvider } from "jotai";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
-import { SidebarViewOptionsMenu } from "./ProjectList";
+import {
+  SidebarOrganizeOptionsMenu,
+  SidebarSortOptionsMenu,
+} from "./ProjectList";
 import {
   sidebarChronologicalSortAtom,
   sidebarOrganizationModeAtom,
+  sidebarSortDirectionAtom,
+  type SidebarSortDirection,
   type SidebarOrganizationMode,
 } from "./sidebarCollapsedAtoms";
 
@@ -13,23 +18,27 @@ export default {
 };
 
 function MenuStory({
+  direction,
   organizationMode,
   sort,
 }: {
+  direction: SidebarSortDirection;
   organizationMode: SidebarOrganizationMode;
-  sort: "updated" | "created";
+  sort: "updated" | "created" | "alpha";
 }) {
   const store = useMemo(() => {
     const next = createStore();
     next.set(sidebarChronologicalSortAtom, sort);
+    next.set(sidebarSortDirectionAtom, direction);
     next.set(sidebarOrganizationModeAtom, organizationMode);
     return next;
-  }, [organizationMode, sort]);
+  }, [direction, organizationMode, sort]);
 
   return (
     <JotaiProvider store={store}>
-      <div className="relative flex h-72 w-80 items-start justify-end rounded-md bg-sidebar p-4 text-sidebar-foreground">
-        <SidebarViewOptionsMenu open />
+      <div className="relative flex h-72 w-80 items-start justify-end gap-1 rounded-md bg-sidebar p-4 text-sidebar-foreground">
+        <SidebarOrganizeOptionsMenu open />
+        <SidebarSortOptionsMenu />
       </div>
     </JotaiProvider>
   );
@@ -39,10 +48,14 @@ export function Overview() {
   return (
     <StoryCard>
       <StoryRow label="project" hint="organize by project">
-        <MenuStory sort="updated" organizationMode="project" />
+        <MenuStory direction="desc" sort="updated" organizationMode="project" />
       </StoryRow>
       <StoryRow label="folders" hint="cross-project folder view">
-        <MenuStory sort="created" organizationMode="chronological" />
+        <MenuStory
+          direction="asc"
+          sort="alpha"
+          organizationMode="chronological"
+        />
       </StoryRow>
     </StoryCard>
   );
diff --git a/apps/app/src/components/sidebar/projectThreadGroups.ts b/apps/app/src/components/sidebar/projectThreadGroups.ts
index 284a19a2c..0542cef82 100644
--- a/apps/app/src/components/sidebar/projectThreadGroups.ts
+++ b/apps/app/src/components/sidebar/projectThreadGroups.ts
@@ -79,10 +79,17 @@ export const PINNED_CONTAINER_ID = "pinned";
 // Orders sibling threads. The default keeps active rows pinned to createdAt and
 // inactive rows on attention recency; chronological mode can swap in a literal
 // createdAt comparator instead.
-export type ThreadComparator = (
+export type ThreadItemComparator = (
+  left: ProjectThreadItem,
+  right: ProjectThreadItem,
+) => number;
+
+export type ThreadComparator = ((
   left: ThreadListEntry,
   right: ThreadListEntry,
-) => number;
+) => number) & {
+  compareItems?: ThreadItemComparator;
+};
 
 type WorktreeDisplayKind = "managed-worktree" | "unmanaged-worktree";
 type SidebarProjectThreadShape = Pick<
@@ -523,8 +530,8 @@ function getItemOrderingThread(
       if (descendants.length === 0) {
         return null;
       }
-      return descendants.reduce(
-        (first, thread) => (compareThreads(thread, first) < 0 ? thread : first),
+      return descendants.reduce((first, thread) =>
+        compareThreads(thread, first) < 0 ? thread : first,
       );
     }
   }
@@ -580,9 +587,7 @@ function orderItemsByManualOrder(
   const orderedKeys = new Set(prunedOrder);
   const unorderedItems = items
     .filter((item) => !orderedKeys.has(getManualOrderItemKey(item)))
-    .sort((left, right) =>
-      compareSiblingItems(left, right, compareThreads),
-    );
+    .sort((left, right) => compareSiblingItems(left, right, compareThreads));
   const orderedItems = prunedOrder.flatMap((key) => {
     const item = itemsByKey.get(key);
     return item ? [item] : [];
@@ -638,6 +643,10 @@ function compareSiblingItems(
   right: ProjectThreadItem,
   compareThreads: ThreadComparator,
 ): number {
+  if (compareThreads.compareItems) {
+    return compareThreads.compareItems(left, right);
+  }
+
   const leftThread = getItemOrderingThread(left, compareThreads);
   const rightThread = getItemOrderingThread(right, compareThreads);
   if (leftThread && rightThread) {
diff --git a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
index 05cebc330..892154c0e 100644
--- a/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
+++ b/apps/app/src/components/sidebar/sidebarCollapsedAtoms.ts
@@ -8,6 +8,7 @@ const COLLAPSED_SIDEBAR_SECTIONS_STORAGE_KEY = "bb.sidebar.collapsedSections";
 const SIDEBAR_SECTION_ORDER_STORAGE_KEY = "bb.sidebar.sectionOrder";
 const ORGANIZATION_MODE_STORAGE_KEY = "bb.sidebar.organizationMode";
 const CHRONOLOGICAL_SORT_STORAGE_KEY = "bb.sidebar.chronologicalSort";
+const SORT_DIRECTION_STORAGE_KEY = "bb.sidebar.sortDirection";
 const GROUP_BY_STORAGE_KEY = "bb.sidebar.groupBy";
 const COLLAPSED_FOLDERS_STORAGE_KEY = "bb.sidebar.collapsedFolders";
 const MANUAL_ORDER_STORAGE_KEY = "bb.sidebar.manualOrder";
@@ -20,9 +21,10 @@ export type CollapsibleSidebarSectionId = "projects" | "threads";
 export type SidebarOrganizationMode = "project" | "chronological";
 // Controls thread ordering in both grouped and ungrouped sidebar views.
 // "updated" reuses the status-aware activity heuristic; "created" sorts by
-// the literal createdAt field. "none" is a legacy/internal value that the
-// runtime normalizes back to "updated".
-export type SidebarChronologicalSort = "updated" | "created" | "none";
+// the literal createdAt field; "alpha" sorts by display title. "none" is a
+// legacy/internal value that the runtime normalizes back to "updated".
+export type SidebarChronologicalSort = "updated" | "created" | "alpha" | "none";
+export type SidebarSortDirection = "asc" | "desc";
 // Low-level folder grouping switch used by folder helpers and tests. The app
 // runtime always renders stored folderPath metadata; "none" remains for
 // regression coverage.
@@ -90,6 +92,13 @@ export const sidebarChronologicalSortAtom =
     { getOnInit: true },
   );
 
+export const sidebarSortDirectionAtom = atomWithStorage<SidebarSortDirection>(
+  SORT_DIRECTION_STORAGE_KEY,
+  "desc",
+  createJsonLocalStorage<SidebarSortDirection>(),
+  { getOnInit: true },
+);
+
 // Story/test control for the low-level folder grouping path. Runtime sidebar
 // trees enable "folder" only in the Folders organization mode.
 export const sidebarGroupByAtom = atomWithStorage<SidebarGroupBy>(

From b65d070851537cb5f7c34352ec2a060f65829b55 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 14:02:26 -0700
Subject: [PATCH 30/54] Refine sidebar organize and sort menus

- Sort options use a single state-driven arrow (none / down=desc / up=asc)
  instead of a check plus dual direction buttons; re-selecting the active
  field flips its direction.
- Organize trigger uses the Layers icon; Sort trigger uses up/down arrows.
- Align the menu section labels to the standard DropdownMenuLabel hierarchy
  used by the rest of the app's dropdowns.
- Make the View options menu story interactive and add TooltipProvider to the
  Ladle harness so tooltip-using stories render instead of crashing blank.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/.ladle/components.tsx                |  11 +-
 .../src/components/sidebar/ProjectList.tsx    | 133 ++++--------------
 .../SidebarViewOptionsMenu.stories.tsx        |  75 ++++++----
 apps/app/src/components/ui/icon.tsx           |   4 +
 4 files changed, 85 insertions(+), 138 deletions(-)

diff --git a/apps/app/.ladle/components.tsx b/apps/app/.ladle/components.tsx
index a1bcbe3cb..b295452ea 100644
--- a/apps/app/.ladle/components.tsx
+++ b/apps/app/.ladle/components.tsx
@@ -6,6 +6,7 @@ import { WorkerPoolContextProvider } from "@pierre/diffs/react";
 import { Provider as JotaiProvider, createStore } from "jotai";
 import { MemoryRouter } from "react-router-dom";
 import { AppToaster } from "../src/components/AppToaster";
+import { TooltipProvider } from "../src/components/ui/tooltip";
 import { setPreferredTheme } from "../src/hooks/useTheme";
 import {
   createDiffWorker,
@@ -65,10 +66,12 @@ export const Provider: GlobalProvider = ({ globalState, children }) => {
             }}
             highlighterOptions={{}}
           >
-            <div className="min-h-screen text-foreground">
-              {children}
-              <AppToaster position="bottom-right" />
-            </div>
+            <TooltipProvider delayDuration={0}>
+              <div className="min-h-screen text-foreground">
+                {children}
+                <AppToaster position="bottom-right" />
+              </div>
+            </TooltipProvider>
           </WorkerPoolContextProvider>
         </QueryClientProvider>
       </JotaiProvider>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index e4fce1ac7..710bf13c9 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -601,27 +601,6 @@ function ProjectListThreadsSectionActions({
   );
 }
 
-interface SidebarOrganizeMenuSectionLabelProps {
-  children: ReactNode;
-  className?: string;
-}
-
-function SidebarOrganizeMenuSectionLabel({
-  children,
-  className,
-}: SidebarOrganizeMenuSectionLabelProps) {
-  return (
-    <DropdownMenuLabel
-      className={cn(
-        "px-2 pb-0.5 text-xs font-semibold text-muted-foreground",
-        className,
-      )}
-    >
-      {children}
-    </DropdownMenuLabel>
-  );
-}
-
 interface SidebarOrganizeMenuOptionProps {
   disabled?: boolean;
   label: string;
@@ -658,11 +637,9 @@ interface SidebarSortMenuOptionProps {
   label: string;
   selected: boolean;
   sort: SidebarChronologicalSort;
-  onDirectionSelect: (
-    sort: SidebarChronologicalSort,
-    direction: SidebarSortDirection,
-  ) => void;
-  onSortSelect: (sort: SidebarChronologicalSort) => void;
+  // Selecting an inactive field activates it descending; selecting the active
+  // field flips its direction.
+  onToggle: (sort: SidebarChronologicalSort) => void;
 }
 
 function SidebarDisplayMenuTrigger({
@@ -701,81 +678,32 @@ function SidebarDisplayMenuTrigger({
   );
 }
 
-function SidebarSortDirectionButton({
-  active,
-  ariaLabel,
-  direction,
-  onClick,
-}: {
-  active: boolean;
-  ariaLabel: string;
-  direction: SidebarSortDirection;
-  onClick: () => void;
-}) {
-  return (
-    <button
-      type="button"
-      aria-label={ariaLabel}
-      aria-pressed={active}
-      onPointerDown={(event) => {
-        event.stopPropagation();
-      }}
-      onClick={(event) => {
-        event.preventDefault();
-        event.stopPropagation();
-        onClick();
-      }}
-      className={cn(
-        "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-subtle-foreground transition-colors hover:bg-sidebar-accent hover:text-sidebar-foreground",
-        active && "bg-sidebar-accent text-sidebar-foreground",
-      )}
-    >
-      <Icon
-        name={direction === "asc" ? "ArrowUp" : "ArrowDown"}
-        className="size-3"
-      />
-    </button>
-  );
-}
-
 function SidebarSortMenuOption({
   direction,
   label,
   selected,
   sort,
-  onDirectionSelect,
-  onSortSelect,
+  onToggle,
 }: SidebarSortMenuOptionProps) {
   return (
     <DropdownMenuItem
       onSelect={(event) => {
         event.preventDefault();
-        onSortSelect(sort);
+        onToggle(sort);
       }}
-      className="flex items-center gap-2"
+      className="flex items-center justify-between gap-3"
     >
-      <span className="min-w-0 flex-1 truncate text-xs">{label}</span>
+      <span className="truncate text-xs">{label}</span>
+      {/* No sort field shows no glyph; the active field shows a single arrow
+          that points down for descending and up for ascending. */}
       <Icon
-        name="Check"
+        name={direction === "asc" ? "ArrowUp" : "ArrowDown"}
+        aria-hidden="true"
         className={cn(
           COARSE_POINTER_ICON_SIZE_CLASS,
           selected ? "opacity-100" : "opacity-0",
         )}
       />
-      <span className="flex shrink-0 items-center gap-0.5">
-        <SidebarSortDirectionButton
-          active={selected && direction === "asc"}
-          ariaLabel={`Sort ${label} ascending`}
-          direction="asc"
-          onClick={() => onDirectionSelect(sort, "asc")}
-        />
-        <SidebarSortDirectionButton
-          active={selected && direction === "desc"}
-          ariaLabel={`Sort ${label} descending`}
-          direction="desc"
-          onClick={() => onDirectionSelect(sort, "desc")}
-        />
-      </span>
     </DropdownMenuItem>
   );
 }
@@ -796,7 +724,7 @@ export function SidebarOrganizeOptionsMenu({
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
       <SidebarDisplayMenuTrigger
         ariaLabel="Sidebar organization options"
-        iconName="GridView"
+        iconName="Layers"
         tooltip="Organize"
       />
       <DropdownMenuContent
@@ -804,9 +732,7 @@ export function SidebarOrganizeOptionsMenu({
         className="w-52"
         mobileTitle="Organize sidebar"
       >
-        <SidebarOrganizeMenuSectionLabel className="pt-1.5">
-          Organize by
-        </SidebarOrganizeMenuSectionLabel>
+        <DropdownMenuLabel>Organize by</DropdownMenuLabel>
         <SidebarOrganizeMenuOption
           label="Project"
           selected={organizationMode === "project"}
@@ -840,54 +766,49 @@ export function SidebarSortOptionsMenu({
   const [sortDirection, setSortDirection] = useAtom(sidebarSortDirectionAtom);
   const selectedSort: SidebarChronologicalSort =
     chronologicalSort === "none" ? "updated" : chronologicalSort;
-  const handleSortSelect = useCallback(
+  const handleSortToggle = useCallback(
     (sort: SidebarChronologicalSort) => {
+      if (selectedSort === sort) {
+        // Re-selecting the active field flips its direction.
+        setSortDirection((current) => (current === "desc" ? "asc" : "desc"));
+        return;
+      }
+      // A newly selected field starts descending.
       setChronologicalSort(sort);
+      setSortDirection("desc");
     },
-    [setChronologicalSort],
-  );
-  const handleDirectionSelect = useCallback(
-    (sort: SidebarChronologicalSort, direction: SidebarSortDirection) => {
-      setChronologicalSort(sort);
-      setSortDirection(direction);
-    },
-    [setChronologicalSort, setSortDirection],
+    [selectedSort, setChronologicalSort, setSortDirection],
   );
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
       <SidebarDisplayMenuTrigger
         ariaLabel="Sidebar sort options"
-        iconName="Sort"
+        iconName="ArrowUpDown"
         tooltip="Sort"
       />
       <DropdownMenuContent align="end" className="w-56" mobileTitle="Sort">
-        <SidebarOrganizeMenuSectionLabel className="pt-1.5">
-          Sort by
-        </SidebarOrganizeMenuSectionLabel>
+        <DropdownMenuLabel>Sort by</DropdownMenuLabel>
         <SidebarSortMenuOption
           label="Updated at"
           sort="updated"
           selected={selectedSort === "updated"}
           direction={sortDirection}
-          onSortSelect={handleSortSelect}
-          onDirectionSelect={handleDirectionSelect}
+          onToggle={handleSortToggle}
         />
         <SidebarSortMenuOption
           label="Created at"
           sort="created"
           selected={selectedSort === "created"}
           direction={sortDirection}
-          onSortSelect={handleSortSelect}
-          onDirectionSelect={handleDirectionSelect}
+          onToggle={handleSortToggle}
         />
         <SidebarSortMenuOption
           label="Alphabetical"
           sort="alpha"
           selected={selectedSort === "alpha"}
           direction={sortDirection}
-          onSortSelect={handleSortSelect}
-          onDirectionSelect={handleDirectionSelect}
+          onToggle={handleSortToggle}
         />
       </DropdownMenuContent>
     </DropdownMenu>
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 0d1b82f2d..335a56c62 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -1,5 +1,9 @@
 import { useMemo } from "react";
-import { createStore, Provider as JotaiProvider } from "jotai";
+import {
+  createStore,
+  Provider as JotaiProvider,
+  useAtomValue,
+} from "jotai";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import {
   SidebarOrganizeOptionsMenu,
@@ -9,36 +13,55 @@ import {
   sidebarChronologicalSortAtom,
   sidebarOrganizationModeAtom,
   sidebarSortDirectionAtom,
-  type SidebarSortDirection,
-  type SidebarOrganizationMode,
 } from "./sidebarCollapsedAtoms";
 
 export default {
   title: "sidebar/View options menu",
 };
 
-function MenuStory({
-  direction,
-  organizationMode,
-  sort,
-}: {
-  direction: SidebarSortDirection;
-  organizationMode: SidebarOrganizationMode;
-  sort: "updated" | "created" | "alpha";
-}) {
+// Live readout of the atoms the menus drive, so the effect of each click is
+// visible even after a menu closes.
+function StateReadout() {
+  const organizationMode = useAtomValue(sidebarOrganizationModeAtom);
+  const sort = useAtomValue(sidebarChronologicalSortAtom);
+  const direction = useAtomValue(sidebarSortDirectionAtom);
+  return (
+    <dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
+      <dt className="text-muted-foreground">organize</dt>
+      <dd className="font-mono">{organizationMode}</dd>
+      <dt className="text-muted-foreground">sort</dt>
+      <dd className="font-mono">{sort}</dd>
+      <dt className="text-muted-foreground">direction</dt>
+      <dd className="font-mono">{direction}</dd>
+    </dl>
+  );
+}
+
+// The menus write to global (atomWithStorage) atoms. A story-local Jotai store
+// keeps each mount self-contained and seeded with the same defaults the app
+// ships, instead of inheriting whatever the last Ladle session left behind.
+function InteractiveMenus() {
   const store = useMemo(() => {
     const next = createStore();
-    next.set(sidebarChronologicalSortAtom, sort);
-    next.set(sidebarSortDirectionAtom, direction);
-    next.set(sidebarOrganizationModeAtom, organizationMode);
+    next.set(sidebarOrganizationModeAtom, "project");
+    next.set(sidebarChronologicalSortAtom, "updated");
+    next.set(sidebarSortDirectionAtom, "desc");
     return next;
-  }, [direction, organizationMode, sort]);
+  }, []);
 
   return (
     <JotaiProvider store={store}>
-      <div className="relative flex h-72 w-80 items-start justify-end gap-1 rounded-md bg-sidebar p-4 text-sidebar-foreground">
-        <SidebarOrganizeOptionsMenu open />
-        <SidebarSortOptionsMenu />
+      <div className="flex w-72 flex-col gap-4 rounded-md bg-sidebar p-4 text-sidebar-foreground">
+        <div className="flex items-center justify-between">
+          <span className="text-xs font-medium text-muted-foreground">
+            Threads
+          </span>
+          <div className="flex items-center gap-1">
+            <SidebarOrganizeOptionsMenu />
+            <SidebarSortOptionsMenu />
+          </div>
+        </div>
+        <StateReadout />
       </div>
     </JotaiProvider>
   );
@@ -47,15 +70,11 @@ function MenuStory({
 export function Overview() {
   return (
     <StoryCard>
-      <StoryRow label="project" hint="organize by project">
-        <MenuStory direction="desc" sort="updated" organizationMode="project" />
-      </StoryRow>
-      <StoryRow label="folders" hint="cross-project folder view">
-        <MenuStory
-          direction="asc"
-          sort="alpha"
-          organizationMode="chronological"
-        />
+      <StoryRow
+        label="interactive"
+        hint="click an icon to open · pick a sort field, click it again to flip ↑/↓"
+      >
+        <InteractiveMenus />
       </StoryRow>
     </StoryCard>
   );
diff --git a/apps/app/src/components/ui/icon.tsx b/apps/app/src/components/ui/icon.tsx
index 14ecfa0e7..28d95ed37 100644
--- a/apps/app/src/components/ui/icon.tsx
+++ b/apps/app/src/components/ui/icon.tsx
@@ -16,6 +16,7 @@ import {
   ArrowUp01Icon,
   ArrowUp02Icon,
   ArrowUpDoubleIcon,
+  ArrowUpDownIcon,
   ArrowTurnBackwardIcon,
   ArrowTurnForwardIcon,
   ArrowUpRight01Icon,
@@ -61,6 +62,7 @@ import {
   InformationCircleIcon,
   InternetIcon,
   LaptopIcon,
+  Layers01Icon,
   LockIcon,
   LayoutTwoColumnIcon,
   LayoutTwoRowIcon,
@@ -108,6 +110,7 @@ const ICON_MAP = {
   ArrowDown: ArrowDown02Icon,
   ArrowRight: ArrowRight02Icon,
   ArrowUp: ArrowUp02Icon,
+  ArrowUpDown: ArrowUpDownIcon,
   ArrowTurnBackward: ArrowTurnBackwardIcon,
   ArrowTurnForward: ArrowTurnForwardIcon,
   ArrowUpRight: ArrowUpRight01Icon,
@@ -159,6 +162,7 @@ const ICON_MAP = {
   GridView: GridViewIcon,
   Info: InformationCircleIcon,
   Laptop: LaptopIcon,
+  Layers: Layers01Icon,
   ListTodo: CheckListIcon,
   Lock: LockIcon,
   Maximize2: ArrowExpand01Icon,

From 5ae181afa4b04fe8e95dc567d31a26af5a068493 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 14:13:29 -0700
Subject: [PATCH 31/54] Drop "folder" from project path-missing tooltip

Reads "Open project settings to fix".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/components/sidebar/ProjectRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 225c3cd89..46c472b75 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -2026,7 +2026,7 @@ function ProjectRowComponent({
                   </NavLink>
                 </TooltipTrigger>
                 <TooltipContent side="bottom">
-                  Open project settings to fix folder
+                  Open project settings to fix
                 </TooltipContent>
               </Tooltip>
             ) : null}

From 6b262c40b08b62a65c5fe2891db954fc46b13a8a Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 15:09:11 -0700
Subject: [PATCH 32/54] Align folder row actions with project rows; compact
 sidebar menus

- Folder rows now expose a dedicated New thread (+) button alongside a
  "..." menu (Rename, Remove), mirroring the project row's action cluster
  instead of stuffing New thread into the menu.
- Size the sidebar/project/thread action and view-options dropdowns to
  their content (drop fixed w-44/w-52/w-56; the shared min-w-[8rem] floor
  remains) so menus wrap their contents.
- Clean up the project path-missing affordance: tooltip reads "Open project
  settings" and the icon's accessible name is "Project path not found".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../components/project/ProjectActionsMenu.tsx |   7 +-
 .../src/components/sidebar/ProjectList.tsx    |   4 +-
 .../app/src/components/sidebar/ProjectRow.tsx |   6 +-
 .../components/sidebar/SidebarFolderRow.tsx   | 102 +++++++++++-------
 .../components/thread/ThreadActionsMenu.tsx   |   2 +-
 5 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/apps/app/src/components/project/ProjectActionsMenu.tsx b/apps/app/src/components/project/ProjectActionsMenu.tsx
index 332b208f2..a9f91d8d8 100644
--- a/apps/app/src/components/project/ProjectActionsMenu.tsx
+++ b/apps/app/src/components/project/ProjectActionsMenu.tsx
@@ -201,7 +201,7 @@ export function ProjectActionsMenu({
         </TooltipTrigger>
         <TooltipContent side="bottom">Project actions</TooltipContent>
       </Tooltip>
-      <DropdownMenuContent align={align} className="w-44">
+      <DropdownMenuContent align={align}>
         <ProjectActionsMenuItems project={project} surface="dropdown" />
       </DropdownMenuContent>
     </DropdownMenu>
@@ -216,10 +216,7 @@ export function ProjectActionsContextMenu({
   return (
     <ContextMenu onOpenChange={onOpenChange}>
       <ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
-      <ContextMenuContent
-        aria-label={`${project.name} actions`}
-        className="w-44"
-      >
+      <ContextMenuContent aria-label={`${project.name} actions`}>
         <ProjectActionsMenuItems project={project} surface="context" />
       </ContextMenuContent>
     </ContextMenu>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 710bf13c9..991166e21 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -729,7 +729,6 @@ export function SidebarOrganizeOptionsMenu({
       />
       <DropdownMenuContent
         align="end"
-        className="w-52"
         mobileTitle="Organize sidebar"
       >
         <DropdownMenuLabel>Organize by</DropdownMenuLabel>
@@ -787,7 +786,7 @@ export function SidebarSortOptionsMenu({
         iconName="ArrowUpDown"
         tooltip="Sort"
       />
-      <DropdownMenuContent align="end" className="w-56" mobileTitle="Sort">
+      <DropdownMenuContent align="end" mobileTitle="Sort">
         <DropdownMenuLabel>Sort by</DropdownMenuLabel>
         <SidebarSortMenuOption
           label="Updated at"
@@ -852,7 +851,6 @@ function SidebarThreadActionsMenu({
       </Tooltip>
       <DropdownMenuContent
         align="end"
-        className="w-44"
         mobileTitle="Threads actions"
       >
         <DropdownMenuItem onSelect={onOpenArchivedThreads}>
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 46c472b75..7cf33adb5 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -975,7 +975,7 @@ function EnvironmentThreadGroupHeaderActions({
             />
           </Button>
         </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" className="w-44">
+        <DropdownMenuContent align="end">
           {onCreateNewThread ? (
             <DropdownMenuItem onSelect={onCreateNewThread}>
               New thread
@@ -2013,7 +2013,7 @@ function ProjectRowComponent({
                       event.stopPropagation();
                       onProjectSelect?.();
                     }}
-                    aria-label="Project folder not found"
+                    aria-label="Project path not found"
                     className={cn(
                       "relative z-10 inline-flex shrink-0 items-center justify-center rounded-md text-destructive outline-none ring-sidebar-ring transition-colors hover:bg-destructive/10 hover:text-destructive focus-visible:ring-2",
                       COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
@@ -2026,7 +2026,7 @@ function ProjectRowComponent({
                   </NavLink>
                 </TooltipTrigger>
                 <TooltipContent side="bottom">
-                  Open project settings to fix
+                  Open project settings
                 </TooltipContent>
               </Tooltip>
             ) : null}
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index 9dcf42fd0..f4c370bf2 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -188,49 +188,73 @@ function SidebarFolderRowComponent({
           )}
           onClick={stopActionsClick}
         >
-          <DropdownMenu onOpenChange={setIsActionsOpen}>
+          {onRename || onRemove ? (
+            <DropdownMenu onOpenChange={setIsActionsOpen}>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="icon"
+                      aria-label={`${pathLabel} folder actions`}
+                      title={undefined}
+                      className={cn(
+                        "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                        COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                      )}
+                    >
+                      <Icon
+                        name="MoreHorizontal"
+                        className={COARSE_POINTER_ICON_SIZE_CLASS}
+                      />
+                    </Button>
+                  </DropdownMenuTrigger>
+                </TooltipTrigger>
+                <TooltipContent side="bottom">Folder actions</TooltipContent>
+              </Tooltip>
+              <DropdownMenuContent align="end">
+                {onRename ? (
+                  <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
+                ) : null}
+                {onRemove ? (
+                  <DropdownMenuItem
+                    className="text-destructive focus:text-destructive"
+                    onSelect={onRemove}
+                  >
+                    Remove
+                  </DropdownMenuItem>
+                ) : null}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          ) : null}
+          {onCreateThread ? (
             <Tooltip>
               <TooltipTrigger asChild>
-                <DropdownMenuTrigger asChild>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon"
-                    aria-label={`${pathLabel} folder actions`}
-                    title={undefined}
-                    className={cn(
-                      "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                      COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                    )}
-                  >
-                    <Icon
-                      name="MoreHorizontal"
-                      className={COARSE_POINTER_ICON_SIZE_CLASS}
-                    />
-                  </Button>
-                </DropdownMenuTrigger>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon"
+                  aria-label={`New thread in ${pathLabel}`}
+                  title={undefined}
+                  onClick={(event) => {
+                    event.stopPropagation();
+                    onCreateThread();
+                  }}
+                  className={cn(
+                    "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                    COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                  )}
+                >
+                  <Icon
+                    name="MessageSquarePlus"
+                    className={COARSE_POINTER_ICON_SIZE_CLASS}
+                  />
+                </Button>
               </TooltipTrigger>
-              <TooltipContent side="bottom">Folder actions</TooltipContent>
+              <TooltipContent side="bottom">New thread</TooltipContent>
             </Tooltip>
-            <DropdownMenuContent align="end" className="w-44">
-              {onCreateThread ? (
-                <DropdownMenuItem onSelect={onCreateThread}>
-                  New thread
-                </DropdownMenuItem>
-              ) : null}
-              {onRename ? (
-                <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
-              ) : null}
-              {onRemove ? (
-                <DropdownMenuItem
-                  className="text-destructive focus:text-destructive"
-                  onSelect={onRemove}
-                >
-                  Remove
-                </DropdownMenuItem>
-              ) : null}
-            </DropdownMenuContent>
-          </DropdownMenu>
+          ) : null}
         </span>
       ) : null}
     </>
diff --git a/apps/app/src/components/thread/ThreadActionsMenu.tsx b/apps/app/src/components/thread/ThreadActionsMenu.tsx
index afe3fdbc8..94352c28e 100644
--- a/apps/app/src/components/thread/ThreadActionsMenu.tsx
+++ b/apps/app/src/components/thread/ThreadActionsMenu.tsx
@@ -190,7 +190,7 @@ export function ThreadActionsMenu({
           />
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align={align} className="w-44">
+      <DropdownMenuContent align={align}>
         <ThreadActionsMenuItems
           thread={thread}
           canDelete={canDelete}

From a03734cf598ee0d00870d09967de1015f5f20ded Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 15:38:38 -0700
Subject: [PATCH 33/54] Restore label on sidebar New thread button

The icon-only New thread action read inconsistently next to the labeled
Automations button below it. Bring back the "New thread" label (Search
stays an icon button alongside).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/components/sidebar/ProjectList.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 991166e21..1450aee19 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -1132,18 +1132,17 @@ export function ProjectListActionButtons({
         <div className="flex min-w-0 items-center gap-1">
           <Button
             type="button"
-            size="icon"
+            size="sm"
             variant="ghost"
-            className={PROJECT_LIST_ACTION_ICON_BUTTON_CLASS}
+            className={cn(PROJECT_LIST_ACTION_BUTTON_CLASS, "flex-1")}
             onClick={onNewChat}
             disabled={isNewChatDisabled}
-            aria-label={newChatTitle}
             title={newChatTitle}
           >
-            <Icon
-              name="MessageSquarePlus"
-              className={COARSE_POINTER_ICON_SIZE_CLASS}
-            />
+            <Icon name="MessageSquarePlus" />
+            <span className="min-w-0 flex-1 truncate text-left">
+              New thread
+            </span>
           </Button>
           {threadSearch ? (
             <Button

From 84830faa6259896b9658c9a5f87a33c87b7225b9 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 15:42:49 -0700
Subject: [PATCH 34/54] Rename archived-threads menu items to "View archived
 threads"

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/components/project/ProjectActionsMenu.tsx | 2 +-
 apps/app/src/components/sidebar/ProjectList.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/app/src/components/project/ProjectActionsMenu.tsx b/apps/app/src/components/project/ProjectActionsMenu.tsx
index a9f91d8d8..cf8665a57 100644
--- a/apps/app/src/components/project/ProjectActionsMenu.tsx
+++ b/apps/app/src/components/project/ProjectActionsMenu.tsx
@@ -123,7 +123,7 @@ function ProjectActionsMenuItems({
           navigate(getProjectArchivedRoutePath(project.id));
         }}
       >
-        Archived threads
+        View archived threads
       </ProjectActionMenuItem>
       <ProjectActionMenuSeparator surface={surface} />
       <ProjectActionMenuItem
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 1450aee19..69c83db0d 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -854,7 +854,7 @@ function SidebarThreadActionsMenu({
         mobileTitle="Threads actions"
       >
         <DropdownMenuItem onSelect={onOpenArchivedThreads}>
-          Archived threads
+          View archived threads
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>

From 23f7ad06bf1721b29c6af3afeffa43cc841801ae Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:04:11 -0700
Subject: [PATCH 35/54] Add per-folder archived threads view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Folder rows now have a "View archived threads" action, opening a
folder-scoped archived list — the analog of a project's archived view.

- Add an optional folderPath filter to the thread list query end to end:
  server-contract schema -> list route -> db listThreads filter.
- useArchivedThreads accepts folderPath (keyed separately in the cache);
  the archived view reads it from a `?folder=` param and labels the folder.
- getFolderArchivedRoutePath builds the projectless archived route scoped
  by folder (folders live in the personal section).
- Thread the onViewArchivedThreadsInFolder callback through the folder row
  chain; the folder "..." menu shows View archived threads / Rename / Remove.
- Cover the db folderPath filter with a regression test.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/components/sidebar/ProjectList.tsx    |  9 ++++
 .../app/src/components/sidebar/ProjectRow.tsx | 14 ++++++
 .../components/sidebar/SidebarFolderRow.tsx   | 18 +++++++-
 apps/app/src/hooks/queries/query-keys.ts      |  1 +
 apps/app/src/hooks/queries/thread-queries.ts  |  6 ++-
 apps/app/src/lib/api.ts                       |  3 ++
 apps/app/src/lib/route-paths.ts               |  8 ++++
 .../src/views/ProjectArchivedThreadsView.tsx  | 18 ++++++--
 apps/server/src/routes/threads/base.ts        |  1 +
 packages/db/src/data/threads.ts               |  3 ++
 packages/db/test/data/threads.test.ts         | 45 +++++++++++++++++++
 packages/server-contract/src/api/threads.ts   |  2 +
 12 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 69c83db0d..ee5ad3c0d 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -47,6 +47,7 @@ import {
 import { useHostDaemon } from "@/hooks/useHostDaemon";
 import { useDialogState } from "@/hooks/useDialogState";
 import {
+  getFolderArchivedRoutePath,
   getProjectlessArchivedRoutePath,
   getRootComposeRoutePath,
 } from "@/lib/route-paths";
@@ -1369,6 +1370,13 @@ function ProjectListComponent({
     },
     [openRootComposeForProject],
   );
+  const handleViewArchivedThreadsInFolder = useCallback(
+    (folderPath: string) => {
+      onProjectSelect?.();
+      navigate(getFolderArchivedRoutePath(folderPath));
+    },
+    [navigate, onProjectSelect],
+  );
   const [folderCreateTarget, setFolderCreateTarget] = useState<{
     projectId: string | null;
   } | null>(null);
@@ -1953,6 +1961,7 @@ function ProjectListComponent({
       collapsedEnvironmentIds={collapsedEnvironmentIds}
       onProjectSelect={onProjectSelect}
       onCreateThreadInFolder={handleCreateThreadInFolder}
+      onViewArchivedThreadsInFolder={handleViewArchivedThreadsInFolder}
       onRenameFolder={handleOpenRenameThreadFolder}
       onRemoveFolder={handleRemoveThreadFolder}
       onToggleThreadCollapsed={toggleThreadCollapsed}
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 7cf33adb5..a3c5d9ff7 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -173,6 +173,7 @@ export interface ChronologicalThreadTreeProps {
   collapsedEnvironmentIds: Set<string>;
   onProjectSelect?: () => void;
   onCreateThreadInFolder?: (folderPath: string) => void;
+  onViewArchivedThreadsInFolder?: (folderPath: string) => void;
   onRenameFolder?: (folderPath: string) => void;
   onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
@@ -233,6 +234,7 @@ interface ThreadTreeItemRowProps {
   variant: ProjectThreadTreeVariant;
   onProjectSelect?: () => void;
   onCreateThreadInFolder?: (folderPath: string) => void;
+  onViewArchivedThreadsInFolder?: (folderPath: string) => void;
   onRenameFolder?: (folderPath: string) => void;
   onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
@@ -254,6 +256,7 @@ interface FolderTreeItemRowProps {
   variant: ProjectThreadTreeVariant;
   onProjectSelect?: () => void;
   onCreateThreadInFolder?: (folderPath: string) => void;
+  onViewArchivedThreadsInFolder?: (folderPath: string) => void;
   onRenameFolder?: (folderPath: string) => void;
   onRemoveFolder?: (folderPath: string) => void;
   onToggleThreadCollapsed: (threadId: string) => void;
@@ -1264,6 +1267,7 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
   variant,
   onProjectSelect,
   onCreateThreadInFolder,
+  onViewArchivedThreadsInFolder,
   onRenameFolder,
   onRemoveFolder,
   onToggleThreadCollapsed,
@@ -1286,6 +1290,7 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
         variant={variant}
         onProjectSelect={onProjectSelect}
         onCreateThreadInFolder={onCreateThreadInFolder}
+        onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
         onRenameFolder={onRenameFolder}
         onRemoveFolder={onRemoveFolder}
         onToggleThreadCollapsed={onToggleThreadCollapsed}
@@ -1353,6 +1358,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   variant,
   onProjectSelect,
   onCreateThreadInFolder,
+  onViewArchivedThreadsInFolder,
   onRenameFolder,
   onRemoveFolder,
   onToggleThreadCollapsed,
@@ -1405,6 +1411,11 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
             ? () => onCreateThreadInFolder(folderPath)
             : undefined
         }
+        onViewArchivedThreads={
+          onViewArchivedThreadsInFolder
+            ? () => onViewArchivedThreadsInFolder(folderPath)
+            : undefined
+        }
         onRename={onRenameFolder ? () => onRenameFolder(folderPath) : undefined}
         onRemove={onRemoveFolder ? () => onRemoveFolder(folderPath) : undefined}
         onToggleCollapsed={handleToggleCollapsed}
@@ -1427,6 +1438,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
                 variant={variant}
                 onProjectSelect={onProjectSelect}
                 onCreateThreadInFolder={onCreateThreadInFolder}
+                onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
                 onRenameFolder={onRenameFolder}
                 onRemoveFolder={onRemoveFolder}
                 onToggleThreadCollapsed={onToggleThreadCollapsed}
@@ -1776,6 +1788,7 @@ export const ChronologicalFolderThreadSections = memo(
     collapsedEnvironmentIds,
     onProjectSelect,
     onCreateThreadInFolder,
+    onViewArchivedThreadsInFolder,
     onRenameFolder,
     onRemoveFolder,
     onToggleThreadCollapsed,
@@ -1822,6 +1835,7 @@ export const ChronologicalFolderThreadSections = memo(
             variant="section"
             onProjectSelect={onProjectSelect}
             onCreateThreadInFolder={onCreateThreadInFolder}
+            onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
             onRenameFolder={onRenameFolder}
             onRemoveFolder={onRemoveFolder}
             onToggleThreadCollapsed={onToggleThreadCollapsed}
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index f4c370bf2..c55a1780e 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -10,6 +10,7 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu.js";
 import { Icon } from "@/components/ui/icon.js";
@@ -61,6 +62,7 @@ interface SidebarFolderRowProps {
   dragBindings?: SidebarSortableDragBindings;
   isDropTargetActive?: boolean;
   onCreateThread?: () => void;
+  onViewArchivedThreads?: () => void;
   onRename?: () => void;
   onRemove?: () => void;
 }
@@ -79,12 +81,16 @@ function SidebarFolderRowComponent({
   isCollapsed,
   onToggleCollapsed,
   onCreateThread,
+  onViewArchivedThreads,
   onRename,
   onRemove,
   stickyLevel,
 }: SidebarFolderRowProps) {
   const [isActionsOpen, setIsActionsOpen] = useState(false);
-  const hasActions = Boolean(onCreateThread || onRename || onRemove);
+  const hasMenuActions = Boolean(
+    onViewArchivedThreads || onRename || onRemove,
+  );
+  const hasActions = Boolean(onCreateThread || hasMenuActions);
   // Collapsed: the header speaks for its hidden descendants through one glyph
   // (pending > working > unread). Expanded: descendants show their own glyphs.
   const showRollupGlyph =
@@ -188,7 +194,7 @@ function SidebarFolderRowComponent({
           )}
           onClick={stopActionsClick}
         >
-          {onRename || onRemove ? (
+          {hasMenuActions ? (
             <DropdownMenu onOpenChange={setIsActionsOpen}>
               <Tooltip>
                 <TooltipTrigger asChild>
@@ -214,6 +220,14 @@ function SidebarFolderRowComponent({
                 <TooltipContent side="bottom">Folder actions</TooltipContent>
               </Tooltip>
               <DropdownMenuContent align="end">
+                {onViewArchivedThreads ? (
+                  <DropdownMenuItem onSelect={onViewArchivedThreads}>
+                    View archived threads
+                  </DropdownMenuItem>
+                ) : null}
+                {onViewArchivedThreads && (onRename || onRemove) ? (
+                  <DropdownMenuSeparator />
+                ) : null}
                 {onRename ? (
                   <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
                 ) : null}
diff --git a/apps/app/src/hooks/queries/query-keys.ts b/apps/app/src/hooks/queries/query-keys.ts
index a5641afe1..f77a8850d 100644
--- a/apps/app/src/hooks/queries/query-keys.ts
+++ b/apps/app/src/hooks/queries/query-keys.ts
@@ -80,6 +80,7 @@ export type ArchivedThreadsKindFilter = "all" | "root" | "child";
 
 export interface ArchivedThreadsListFilters {
   projectId: string;
+  folderPath?: string;
 }
 
 export const ARCHIVED_THREADS_LIST_KIND = "archivedList";
diff --git a/apps/app/src/hooks/queries/thread-queries.ts b/apps/app/src/hooks/queries/thread-queries.ts
index 3b2587c3c..6832c9d0e 100644
--- a/apps/app/src/hooks/queries/thread-queries.ts
+++ b/apps/app/src/hooks/queries/thread-queries.ts
@@ -269,13 +269,15 @@ export function hasThreadSearchableQuery(value: string): boolean {
 
 export interface UseArchivedThreadsFilters {
   projectId: string | undefined;
+  /** Restrict to threads filed directly under this folder path. */
+  folderPath?: string;
 }
 
 export function useArchivedThreads(
   filters: UseArchivedThreadsFilters,
   options?: QueryOptions,
 ) {
-  const { projectId } = filters;
+  const { projectId, folderPath } = filters;
   const enabled = (options?.enabled ?? true) && Boolean(projectId);
   useThreadListRealtimeSubscription({ enabled });
 
@@ -288,11 +290,13 @@ export function useArchivedThreads(
   >({
     queryKey: archivedThreadsListQueryKey({
       projectId: projectId ?? "",
+      ...(folderPath ? { folderPath } : {}),
     }),
     queryFn: ({ pageParam, signal }) =>
       api.listThreads(
         {
           projectId: requireThreadId(projectId ?? "", "useArchivedThreads"),
+          ...(folderPath ? { folderPath } : {}),
           archived: true,
           limit: ARCHIVED_THREADS_PAGE_SIZE,
           offset: pageParam,
diff --git a/apps/app/src/lib/api.ts b/apps/app/src/lib/api.ts
index 52f3fc44e..289d1ddff 100644
--- a/apps/app/src/lib/api.ts
+++ b/apps/app/src/lib/api.ts
@@ -857,6 +857,8 @@ export interface ThreadListFilters {
   projectId?: string;
   parentThreadId?: string;
   sourceThreadId?: string;
+  /** Restrict to threads filed directly under this folder path. */
+  folderPath?: string;
   hasParent?: boolean;
   /** Restrict to threads spawned with this origin (fork or side-chat). */
   originKind?: ThreadChildOrigin;
@@ -892,6 +894,7 @@ export async function listThreads(
           ...(filters.sourceThreadId
             ? { sourceThreadId: filters.sourceThreadId }
             : {}),
+          ...(filters.folderPath ? { folderPath: filters.folderPath } : {}),
           ...(filters.hasParent !== undefined
             ? { hasParent: toBooleanQueryValue(filters.hasParent) }
             : {}),
diff --git a/apps/app/src/lib/route-paths.ts b/apps/app/src/lib/route-paths.ts
index 0b303901b..a4801870f 100644
--- a/apps/app/src/lib/route-paths.ts
+++ b/apps/app/src/lib/route-paths.ts
@@ -108,6 +108,14 @@ export function getProjectArchivedRoutePath(projectId: string): string {
   return `/projects/${projectId}/archived`;
 }
 
+// Folders live in the personal/projectless section, so a folder's archived
+// list reuses the projectless archived route, scoped by a `folder` query param.
+export function getFolderArchivedRoutePath(folderPath: string): string {
+  return `${PROJECTLESS_ARCHIVED_ROUTE_PATH}?folder=${encodeURIComponent(
+    folderPath,
+  )}`;
+}
+
 export function getThreadRoutePath(args: ThreadRoutePathArgs): string {
   return isProjectlessProjectId(args.projectId)
     ? `/threads/${args.threadId}`
diff --git a/apps/app/src/views/ProjectArchivedThreadsView.tsx b/apps/app/src/views/ProjectArchivedThreadsView.tsx
index 1aea5f103..3051f79ac 100644
--- a/apps/app/src/views/ProjectArchivedThreadsView.tsx
+++ b/apps/app/src/views/ProjectArchivedThreadsView.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link, useSearchParams } from "react-router-dom";
 import type { ThreadListEntry } from "@bb/domain";
 import { Button } from "@/components/ui/button.js";
 import { EmptyStatePanel } from "@/components/ui/empty-state.js";
@@ -23,7 +23,12 @@ function getArchivedThreadPillLabel(
 
 export function ProjectArchivedThreadsView() {
   const { projectId } = useRouteState();
-  const archivedThreadsQuery = useArchivedThreads({ projectId });
+  const [searchParams] = useSearchParams();
+  const folderPath = searchParams.get("folder") ?? undefined;
+  const archivedThreadsQuery = useArchivedThreads({
+    projectId,
+    ...(folderPath ? { folderPath } : {}),
+  });
   const unarchiveThread = useUnarchiveThread();
 
   const archivedThreads = useMemo(() => {
@@ -50,13 +55,20 @@ export function ProjectArchivedThreadsView() {
     <PageShell contentClassName="pt-0">
       <div className="mx-auto w-full max-w-3xl">
         <div className="space-y-3 pt-4 md:pt-5">
+          {folderPath ? (
+            <h1 className="text-sm font-medium text-foreground">
+              Archived threads in {folderPath}
+            </h1>
+          ) : null}
           {isInitialLoading ? (
             <p className="text-sm text-muted-foreground">
               Loading archived threads…
             </p>
           ) : showEmptyState ? (
             <EmptyStatePanel className="py-4 text-left">
-              No archived threads yet.
+              {folderPath
+                ? "No archived threads in this folder yet."
+                : "No archived threads yet."}
             </EmptyStatePanel>
           ) : (
             <div className="space-y-1">
diff --git a/apps/server/src/routes/threads/base.ts b/apps/server/src/routes/threads/base.ts
index a8b658165..1d38c2c8b 100644
--- a/apps/server/src/routes/threads/base.ts
+++ b/apps/server/src/routes/threads/base.ts
@@ -212,6 +212,7 @@ export function registerThreadBaseRoutes(app: Hono, deps: AppDeps): void {
       ...(query.projectId ? { projectId: query.projectId } : {}),
       ...(query.parentThreadId ? { parentThreadId: query.parentThreadId } : {}),
       ...(query.sourceThreadId ? { sourceThreadId: query.sourceThreadId } : {}),
+      ...(query.folderPath ? { folderPath: query.folderPath } : {}),
       ...(query.originKind ? { originKind: query.originKind } : {}),
       ...(query.childOrigin ? { childOrigin: query.childOrigin } : {}),
       archived:
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index d810bec82..681e8d15e 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -318,6 +318,8 @@ export function getThread(db: ThreadWriteConnection, id: string) {
 export interface ListThreadsOptions {
   projectId?: string;
   archived?: boolean;
+  /** Restrict to threads filed directly under this folder path. */
+  folderPath?: string;
   parentThreadId?: string;
   /** When true, restrict to child threads. When false, restrict to root threads. */
   hasParent?: boolean;
@@ -617,6 +619,7 @@ function buildListThreadsFilters(options: ListThreadsOptions) {
   const originKind = options.originKind ?? options.childOrigin;
   return [
     options.projectId ? eq(threads.projectId, options.projectId) : undefined,
+    options.folderPath ? eq(threads.folderPath, options.folderPath) : undefined,
     isNull(threads.deletedAt),
     options.parentThreadId
       ? eq(threads.parentThreadId, options.parentThreadId)
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 7db6400c7..9d7d4d839 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -313,6 +313,51 @@ describe("threads", () => {
     expect(listThreads(db, { projectId: project.id })).toHaveLength(2);
   });
 
+  it("filters archived threads by folder path", () => {
+    const { db, project } = setup();
+    const archivedInWork = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "work",
+    });
+    const otherArchivedInWork = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "work",
+    });
+    const archivedInPlay = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "play",
+    });
+    // Active (non-archived) thread in the same folder must be excluded.
+    createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "work",
+    });
+    archiveThread(db, noopNotifier, archivedInWork.id);
+    archiveThread(db, noopNotifier, otherArchivedInWork.id);
+    archiveThread(db, noopNotifier, archivedInPlay.id);
+
+    const workArchived = listThreads(db, {
+      projectId: project.id,
+      archived: true,
+      folderPath: "work",
+    });
+    expect(workArchived.map((thread) => thread.id).sort()).toEqual(
+      [archivedInWork.id, otherArchivedInWork.id].sort(),
+    );
+
+    expect(
+      listThreads(db, {
+        projectId: project.id,
+        archived: true,
+        folderPath: "play",
+      }),
+    ).toHaveLength(1);
+  });
+
   it("isolates threads by project", () => {
     const { db, host, project } = setup();
     const { project: otherProject } = createProject(db, noopNotifier, {
diff --git a/packages/server-contract/src/api/threads.ts b/packages/server-contract/src/api/threads.ts
index f46322a87..8138e08c5 100644
--- a/packages/server-contract/src/api/threads.ts
+++ b/packages/server-contract/src/api/threads.ts
@@ -428,6 +428,8 @@ export const threadListQuerySchema = z.object({
   parentThreadId: z.string().min(1).optional(),
   sourceThreadId: z.string().min(1).optional(),
   archived: z.enum(["true", "false"]).optional(),
+  /** Restrict to threads filed directly under this folder path. */
+  folderPath: z.string().min(1).optional(),
   /** Filter by parent thread presence: "true" means child threads; "false" means root threads. */
   hasParent: z.enum(["true", "false"]).optional(),
   /** Restrict to threads spawned with this origin (fork or side-chat). */

From 5b1a4bd5689540d93382a617fcc5f3faebc38247 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:09:21 -0700
Subject: [PATCH 36/54] Match sidebar tooltip timing to the agent message
 action bar

The sidebar's TooltipProvider opened tooltips instantly (delayDuration 0),
which felt flickery on hover. Use 300ms like MessageActionBar so sidebar
icon tooltips open/close with the same cadence. Mirror it in the Ladle
harness for story fidelity.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/.ladle/components.tsx         | 2 +-
 apps/app/src/components/ui/sidebar.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/app/.ladle/components.tsx b/apps/app/.ladle/components.tsx
index b295452ea..de4979a95 100644
--- a/apps/app/.ladle/components.tsx
+++ b/apps/app/.ladle/components.tsx
@@ -66,7 +66,7 @@ export const Provider: GlobalProvider = ({ globalState, children }) => {
             }}
             highlighterOptions={{}}
           >
-            <TooltipProvider delayDuration={0}>
+            <TooltipProvider delayDuration={300}>
               <div className="min-h-screen text-foreground">
                 {children}
                 <AppToaster position="bottom-right" />
diff --git a/apps/app/src/components/ui/sidebar.tsx b/apps/app/src/components/ui/sidebar.tsx
index bc707c89a..56befee99 100644
--- a/apps/app/src/components/ui/sidebar.tsx
+++ b/apps/app/src/components/ui/sidebar.tsx
@@ -151,7 +151,10 @@ const SidebarProvider = React.forwardRef<
 
     return (
       <SidebarContext.Provider value={contextValue}>
-        <TooltipProvider delayDuration={0}>
+        {/* Match the agent message action bar's tooltip timing (300ms open
+            delay + Radix's default skip window) so sidebar icon tooltips feel
+            the same instead of flashing instantly on hover. */}
+        <TooltipProvider delayDuration={300}>
           <div
             style={
               {

From 8fc29346534fb4a281cd396032f140a59b1c99a7 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:14:45 -0700
Subject: [PATCH 37/54] Scope the loose-threads archived view to unfiled
 threads

The personal "Threads" archived list (no folder selected) was showing
threads that live in a folder. Add an `unfiled` thread-list filter
(folderPath IS NULL) end to end and use it for the personal archived view,
so foldered archived threads appear only in their folder's archived list.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/hooks/queries/query-keys.ts      |  1 +
 apps/app/src/hooks/queries/thread-queries.ts  |  6 ++++-
 apps/app/src/lib/api.ts                       |  3 +++
 .../src/views/ProjectArchivedThreadsView.tsx  |  6 ++++-
 apps/server/src/routes/threads/base.ts        |  1 +
 packages/db/src/data/threads.ts               |  3 +++
 packages/db/test/data/threads.test.ts         | 24 +++++++++++++++++++
 packages/server-contract/src/api/threads.ts   |  2 ++
 8 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/apps/app/src/hooks/queries/query-keys.ts b/apps/app/src/hooks/queries/query-keys.ts
index f77a8850d..04a23dffd 100644
--- a/apps/app/src/hooks/queries/query-keys.ts
+++ b/apps/app/src/hooks/queries/query-keys.ts
@@ -81,6 +81,7 @@ export type ArchivedThreadsKindFilter = "all" | "root" | "child";
 export interface ArchivedThreadsListFilters {
   projectId: string;
   folderPath?: string;
+  unfiled?: boolean;
 }
 
 export const ARCHIVED_THREADS_LIST_KIND = "archivedList";
diff --git a/apps/app/src/hooks/queries/thread-queries.ts b/apps/app/src/hooks/queries/thread-queries.ts
index 6832c9d0e..0806aa1b0 100644
--- a/apps/app/src/hooks/queries/thread-queries.ts
+++ b/apps/app/src/hooks/queries/thread-queries.ts
@@ -271,13 +271,15 @@ export interface UseArchivedThreadsFilters {
   projectId: string | undefined;
   /** Restrict to threads filed directly under this folder path. */
   folderPath?: string;
+  /** Restrict to loose threads — those not filed under any folder. */
+  unfiled?: boolean;
 }
 
 export function useArchivedThreads(
   filters: UseArchivedThreadsFilters,
   options?: QueryOptions,
 ) {
-  const { projectId, folderPath } = filters;
+  const { projectId, folderPath, unfiled } = filters;
   const enabled = (options?.enabled ?? true) && Boolean(projectId);
   useThreadListRealtimeSubscription({ enabled });
 
@@ -291,12 +293,14 @@ export function useArchivedThreads(
     queryKey: archivedThreadsListQueryKey({
       projectId: projectId ?? "",
       ...(folderPath ? { folderPath } : {}),
+      ...(unfiled ? { unfiled: true } : {}),
     }),
     queryFn: ({ pageParam, signal }) =>
       api.listThreads(
         {
           projectId: requireThreadId(projectId ?? "", "useArchivedThreads"),
           ...(folderPath ? { folderPath } : {}),
+          ...(unfiled ? { unfiled: true } : {}),
           archived: true,
           limit: ARCHIVED_THREADS_PAGE_SIZE,
           offset: pageParam,
diff --git a/apps/app/src/lib/api.ts b/apps/app/src/lib/api.ts
index 289d1ddff..5fd758a18 100644
--- a/apps/app/src/lib/api.ts
+++ b/apps/app/src/lib/api.ts
@@ -859,6 +859,8 @@ export interface ThreadListFilters {
   sourceThreadId?: string;
   /** Restrict to threads filed directly under this folder path. */
   folderPath?: string;
+  /** Restrict to loose threads — those not filed under any folder. */
+  unfiled?: boolean;
   hasParent?: boolean;
   /** Restrict to threads spawned with this origin (fork or side-chat). */
   originKind?: ThreadChildOrigin;
@@ -895,6 +897,7 @@ export async function listThreads(
             ? { sourceThreadId: filters.sourceThreadId }
             : {}),
           ...(filters.folderPath ? { folderPath: filters.folderPath } : {}),
+          ...(filters.unfiled ? { unfiled: toBooleanQueryValue(true) } : {}),
           ...(filters.hasParent !== undefined
             ? { hasParent: toBooleanQueryValue(filters.hasParent) }
             : {}),
diff --git a/apps/app/src/views/ProjectArchivedThreadsView.tsx b/apps/app/src/views/ProjectArchivedThreadsView.tsx
index 3051f79ac..42afb2f18 100644
--- a/apps/app/src/views/ProjectArchivedThreadsView.tsx
+++ b/apps/app/src/views/ProjectArchivedThreadsView.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { Link, useSearchParams } from "react-router-dom";
-import type { ThreadListEntry } from "@bb/domain";
+import { PERSONAL_PROJECT_ID, type ThreadListEntry } from "@bb/domain";
 import { Button } from "@/components/ui/button.js";
 import { EmptyStatePanel } from "@/components/ui/empty-state.js";
 import { PageShell } from "@/components/ui/page-shell.js";
@@ -25,9 +25,13 @@ export function ProjectArchivedThreadsView() {
   const { projectId } = useRouteState();
   const [searchParams] = useSearchParams();
   const folderPath = searchParams.get("folder") ?? undefined;
+  // The personal section's archived list shows loose threads only; threads
+  // filed in a folder live in that folder's archived list instead.
+  const restrictToLoose = !folderPath && projectId === PERSONAL_PROJECT_ID;
   const archivedThreadsQuery = useArchivedThreads({
     projectId,
     ...(folderPath ? { folderPath } : {}),
+    ...(restrictToLoose ? { unfiled: true } : {}),
   });
   const unarchiveThread = useUnarchiveThread();
 
diff --git a/apps/server/src/routes/threads/base.ts b/apps/server/src/routes/threads/base.ts
index 1d38c2c8b..3c441790a 100644
--- a/apps/server/src/routes/threads/base.ts
+++ b/apps/server/src/routes/threads/base.ts
@@ -213,6 +213,7 @@ export function registerThreadBaseRoutes(app: Hono, deps: AppDeps): void {
       ...(query.parentThreadId ? { parentThreadId: query.parentThreadId } : {}),
       ...(query.sourceThreadId ? { sourceThreadId: query.sourceThreadId } : {}),
       ...(query.folderPath ? { folderPath: query.folderPath } : {}),
+      ...(query.unfiled === "true" ? { unfiled: true } : {}),
       ...(query.originKind ? { originKind: query.originKind } : {}),
       ...(query.childOrigin ? { childOrigin: query.childOrigin } : {}),
       archived:
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index 681e8d15e..507f5c570 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -320,6 +320,8 @@ export interface ListThreadsOptions {
   archived?: boolean;
   /** Restrict to threads filed directly under this folder path. */
   folderPath?: string;
+  /** Restrict to loose threads — those not filed under any folder. */
+  unfiled?: boolean;
   parentThreadId?: string;
   /** When true, restrict to child threads. When false, restrict to root threads. */
   hasParent?: boolean;
@@ -620,6 +622,7 @@ function buildListThreadsFilters(options: ListThreadsOptions) {
   return [
     options.projectId ? eq(threads.projectId, options.projectId) : undefined,
     options.folderPath ? eq(threads.folderPath, options.folderPath) : undefined,
+    options.unfiled ? isNull(threads.folderPath) : undefined,
     isNull(threads.deletedAt),
     options.parentThreadId
       ? eq(threads.parentThreadId, options.parentThreadId)
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 9d7d4d839..3bf8381f6 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -358,6 +358,30 @@ describe("threads", () => {
     ).toHaveLength(1);
   });
 
+  it("filters archived threads to loose (unfiled) only", () => {
+    const { db, project } = setup();
+    const looseArchived = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+    });
+    const foldered = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "work",
+    });
+    archiveThread(db, noopNotifier, looseArchived.id);
+    archiveThread(db, noopNotifier, foldered.id);
+
+    const unfiledArchived = listThreads(db, {
+      projectId: project.id,
+      archived: true,
+      unfiled: true,
+    });
+    expect(unfiledArchived.map((thread) => thread.id)).toEqual([
+      looseArchived.id,
+    ]);
+  });
+
   it("isolates threads by project", () => {
     const { db, host, project } = setup();
     const { project: otherProject } = createProject(db, noopNotifier, {
diff --git a/packages/server-contract/src/api/threads.ts b/packages/server-contract/src/api/threads.ts
index 8138e08c5..054ce0e3c 100644
--- a/packages/server-contract/src/api/threads.ts
+++ b/packages/server-contract/src/api/threads.ts
@@ -430,6 +430,8 @@ export const threadListQuerySchema = z.object({
   archived: z.enum(["true", "false"]).optional(),
   /** Restrict to threads filed directly under this folder path. */
   folderPath: z.string().min(1).optional(),
+  /** Restrict to loose threads — those not filed under any folder. */
+  unfiled: z.enum(["true", "false"]).optional(),
   /** Filter by parent thread presence: "true" means child threads; "false" means root threads. */
   hasParent: z.enum(["true", "false"]).optional(),
   /** Restrict to threads spawned with this origin (fork or side-chat). */

From d3bf0b6700e048ebb69ecf140c546bcd758a28b5 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:26:56 -0700
Subject: [PATCH 38/54] Unify archived views; show folder scope in the header
 breadcrumb

The folder archived page diverged from the project/personal pages with a
bespoke in-body heading. Make all archived scopes render the one shared
view and carry their scope in the AppLayout breadcrumb instead:

- Rename ProjectArchivedThreadsView -> ArchivedThreadsView (it already
  serves project, personal/loose, and folder scopes) and drop the bespoke
  folder heading + folder-specific empty state so the body is identical.
- Add a folder segment to the projectless archived breadcrumb
  ("Threads > <folder> > Archived") and document title, mirroring how the
  project name scopes the project archived page.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/App.tsx                            | 10 +++++-----
 apps/app/src/components/layout/AppLayout.tsx    | 12 +++++++++++-
 ...dThreadsView.tsx => ArchivedThreadsView.tsx} | 17 ++++++++---------
 3 files changed, 24 insertions(+), 15 deletions(-)
 rename apps/app/src/views/{ProjectArchivedThreadsView.tsx => ArchivedThreadsView.tsx} (90%)

diff --git a/apps/app/src/App.tsx b/apps/app/src/App.tsx
index 1eb7194f3..e51cc6f84 100644
--- a/apps/app/src/App.tsx
+++ b/apps/app/src/App.tsx
@@ -55,9 +55,9 @@ const ProjectSettingsView = lazy(() =>
     default: m.ProjectSettingsView,
   })),
 );
-const ProjectArchivedThreadsView = lazy(() =>
-  import("./views/ProjectArchivedThreadsView").then((m) => ({
-    default: m.ProjectArchivedThreadsView,
+const ArchivedThreadsView = lazy(() =>
+  import("./views/ArchivedThreadsView").then((m) => ({
+    default: m.ArchivedThreadsView,
   })),
 );
 const PopoutChatView = lazy(() =>
@@ -117,11 +117,11 @@ function AppRoutes() {
           />
           <Route
             path={PROJECT_ARCHIVED_ROUTE_PATH}
-            element={<ProjectArchivedThreadsView />}
+            element={<ArchivedThreadsView />}
           />
           <Route
             path={PROJECTLESS_ARCHIVED_ROUTE_PATH}
-            element={<ProjectArchivedThreadsView />}
+            element={<ArchivedThreadsView />}
           />
           <Route
             path={THREAD_DETAIL_ROUTE_PATH}
diff --git a/apps/app/src/components/layout/AppLayout.tsx b/apps/app/src/components/layout/AppLayout.tsx
index d84c6e0d0..9bd6acc1a 100644
--- a/apps/app/src/components/layout/AppLayout.tsx
+++ b/apps/app/src/components/layout/AppLayout.tsx
@@ -387,6 +387,11 @@ export function AppLayout({ children }: AppLayoutProps) {
     { enabled: isAutomationDetailView },
   );
   const automationName = automationDetail?.name ?? "Automation";
+  // Folder-scoped archived list (`/archived?folder=<path>`); drives the
+  // breadcrumb's folder segment.
+  const archivedFolderPath = isArchivedView
+    ? new URLSearchParams(location.search).get("folder")
+    : null;
   const sidebarNavigationQuery = useSidebarNavigation();
   const projects = useMemo(
     () => sidebarNavigationQuery.data?.projects.map(stripProjectThreads),
@@ -465,6 +470,9 @@ export function AppLayout({ children }: AppLayoutProps) {
               subtitle: undefined,
               breadcrumbs: [
                 { label: "Threads", to: getRootComposeRoutePath() },
+                ...(archivedFolderPath
+                  ? [{ label: archivedFolderPath }]
+                  : []),
                 { label: "Archived" },
               ],
             }
@@ -507,7 +515,9 @@ export function AppLayout({ children }: AppLayoutProps) {
     }
     if (isArchivedView && projectId) {
       if (isProjectlessProjectId(projectId)) {
-        return "Threads · Archived";
+        return archivedFolderPath
+          ? `${archivedFolderPath} · Archived`
+          : "Threads · Archived";
       }
       return `${projectLabel ?? projectId} · Archived`;
     }
diff --git a/apps/app/src/views/ProjectArchivedThreadsView.tsx b/apps/app/src/views/ArchivedThreadsView.tsx
similarity index 90%
rename from apps/app/src/views/ProjectArchivedThreadsView.tsx
rename to apps/app/src/views/ArchivedThreadsView.tsx
index 42afb2f18..27d3501b5 100644
--- a/apps/app/src/views/ProjectArchivedThreadsView.tsx
+++ b/apps/app/src/views/ArchivedThreadsView.tsx
@@ -21,7 +21,13 @@ function getArchivedThreadPillLabel(
   return null;
 }
 
-export function ProjectArchivedThreadsView() {
+// One archived-threads page for every scope. The route + `?folder=` param
+// decide which threads are listed; the scope is shown in the AppLayout header
+// breadcrumb (project name / "Threads" / folder), so the body stays identical:
+//   - project:        all archived threads in a project
+//   - personal/loose: archived threads not filed under any folder (unfiled)
+//   - folder:         archived threads filed directly under one folder
+export function ArchivedThreadsView() {
   const { projectId } = useRouteState();
   const [searchParams] = useSearchParams();
   const folderPath = searchParams.get("folder") ?? undefined;
@@ -59,20 +65,13 @@ export function ProjectArchivedThreadsView() {
     <PageShell contentClassName="pt-0">
       <div className="mx-auto w-full max-w-3xl">
         <div className="space-y-3 pt-4 md:pt-5">
-          {folderPath ? (
-            <h1 className="text-sm font-medium text-foreground">
-              Archived threads in {folderPath}
-            </h1>
-          ) : null}
           {isInitialLoading ? (
             <p className="text-sm text-muted-foreground">
               Loading archived threads…
             </p>
           ) : showEmptyState ? (
             <EmptyStatePanel className="py-4 text-left">
-              {folderPath
-                ? "No archived threads in this folder yet."
-                : "No archived threads yet."}
+              No archived threads yet.
             </EmptyStatePanel>
           ) : (
             <div className="space-y-1">

From ab6710d7c6084497a2d4094b5270ddb7e94c0487 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:38:10 -0700
Subject: [PATCH 39/54] =?UTF-8?q?Fix=20alphabetical=20sort=20direction=20(?=
 =?UTF-8?q?leaf/folder=20consistency)=20+=20default=20A=E2=86=92Z?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Smoke testing surfaced that the title sort inverted the wrong way: its base
comparator ascends (A→Z), but getSidebarThreadComparator applied the same
"asc inverts" rule used for the descending time sorts. So leaf threads sorted
opposite to the folder/item comparator (folders Z→A while threads A→Z) and the
↑/↓ arrows read backwards for alphabetical.

- Special-case the ascending title base: asc keeps it (A→Z), desc inverts it
  (Z→A), for both the leaf and mixed folder/thread comparators.
- Default a newly selected Alphabetical sort to asc (A→Z); time sorts still
  default to desc (newest first).
- Export getSidebarThreadComparator and add direction/consistency tests.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/components/sidebar/ProjectList.tsx    |  46 +++---
 .../components/sidebar/sortComparator.test.ts | 134 ++++++++++++++++++
 2 files changed, 160 insertions(+), 20 deletions(-)
 create mode 100644 apps/app/src/components/sidebar/sortComparator.test.ts

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index ee5ad3c0d..22ecf4b6e 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -489,7 +489,7 @@ function invertThreadComparator(
   };
 }
 
-function getSidebarThreadComparator({
+export function getSidebarThreadComparator({
   direction,
   sort,
 }: {
@@ -497,28 +497,33 @@ function getSidebarThreadComparator({
   sort: SidebarChronologicalSort;
 }): ThreadComparator {
   const normalizedSort = sort === "none" ? "updated" : sort;
-  const baseComparator: ThreadComparator =
-    normalizedSort === "created"
-      ? compareByCreatedAtDescending
-      : normalizedSort === "alpha"
+
+  if (normalizedSort === "alpha") {
+    // Title sort's base is *ascending* (A→Z), unlike the time sorts whose
+    // bases descend. So here asc keeps the base and desc inverts it — and the
+    // leaf-thread and mixed folder/thread comparators must apply the same
+    // direction, or folders and threads would sort in opposite order.
+    const comparator: ThreadComparator =
+      direction === "asc"
         ? compareByTitleAscending
-        : compareStandardThreads;
-  const compareItems =
-    normalizedSort === "alpha"
-      ? compareProjectThreadItemsByTitleAscending
-      : undefined;
-  const comparator: ThreadComparator =
-    direction === "asc"
-      ? invertThreadComparator(baseComparator)
-      : baseComparator;
-  if (compareItems) {
+        : invertThreadComparator(compareByTitleAscending);
     comparator.compareItems =
       direction === "asc"
-        ? compareItems
-        : (left, right) => invertNumber(compareItems(left, right));
+        ? compareProjectThreadItemsByTitleAscending
+        : (left, right) =>
+            invertNumber(compareProjectThreadItemsByTitleAscending(left, right));
+    return comparator;
   }
 
-  return comparator;
+  // "created"/"updated" bases list newest / most-recently-active first, so desc
+  // keeps the base and asc inverts it.
+  const baseComparator: ThreadComparator =
+    normalizedSort === "created"
+      ? compareByCreatedAtDescending
+      : compareStandardThreads;
+  return direction === "asc"
+    ? invertThreadComparator(baseComparator)
+    : baseComparator;
 }
 
 function ProjectListSectionIconButton({
@@ -773,9 +778,10 @@ export function SidebarSortOptionsMenu({
         setSortDirection((current) => (current === "desc" ? "asc" : "desc"));
         return;
       }
-      // A newly selected field starts descending.
+      // A newly selected field starts in its natural direction: time sorts show
+      // newest first (desc); alphabetical starts A→Z (asc).
       setChronologicalSort(sort);
-      setSortDirection("desc");
+      setSortDirection(sort === "alpha" ? "asc" : "desc");
     },
     [selectedSort, setChronologicalSort, setSortDirection],
   );
diff --git a/apps/app/src/components/sidebar/sortComparator.test.ts b/apps/app/src/components/sidebar/sortComparator.test.ts
new file mode 100644
index 000000000..adf64bf4e
--- /dev/null
+++ b/apps/app/src/components/sidebar/sortComparator.test.ts
@@ -0,0 +1,134 @@
+import { describe, expect, it } from "vitest";
+import type { ThreadListEntry } from "@bb/domain";
+import { getSidebarThreadComparator } from "./ProjectList";
+import type { ProjectThreadItem, ThreadComparator } from "./projectThreadGroups";
+
+function thread(overrides: Partial<ThreadListEntry>): ThreadListEntry {
+  return {
+    id: "thr_1",
+    projectId: "proj_1",
+    environmentId: null,
+    providerId: "codex",
+    title: "Thread",
+    titleFallback: "Thread",
+    folderPath: null,
+    status: "idle",
+    parentThreadId: null,
+    sourceThreadId: null,
+    originKind: null,
+    childOrigin: null,
+    archivedAt: null,
+    pinnedAt: null,
+    pinSortKey: null,
+    deletedAt: null,
+    lastReadAt: 0,
+    latestAttentionAt: 2,
+    createdAt: 1,
+    updatedAt: 2,
+    hasPendingInteraction: false,
+    environmentHostId: null,
+    environmentName: null,
+    environmentBranchName: null,
+    environmentWorkspaceDisplayKind: "other",
+    runtime: {
+      displayStatus: "idle",
+      hostReconnectGraceExpiresAt: null,
+    },
+    ...overrides,
+  };
+}
+
+// The item comparator only reads node.thread for thread-kind items.
+function threadItem(entry: ThreadListEntry): ProjectThreadItem {
+  return { kind: "thread", node: { thread: entry } } as unknown as ProjectThreadItem;
+}
+
+const apple = thread({
+  id: "thr_a",
+  title: "Apple",
+  createdAt: 100,
+  latestAttentionAt: 100,
+});
+const banana = thread({
+  id: "thr_b",
+  title: "Banana",
+  createdAt: 200,
+  latestAttentionAt: 200,
+});
+const cherry = thread({
+  id: "thr_c",
+  title: "Cherry",
+  createdAt: 300,
+  latestAttentionAt: 300,
+});
+
+function order(comparator: ThreadComparator, entries: ThreadListEntry[]) {
+  return [...entries].sort(comparator).map((entry) => entry.id);
+}
+
+describe("getSidebarThreadComparator", () => {
+  it("created: desc lists newest first, asc lists oldest first", () => {
+    expect(
+      order(getSidebarThreadComparator({ sort: "created", direction: "desc" }), [
+        apple,
+        banana,
+        cherry,
+      ]),
+    ).toEqual(["thr_c", "thr_b", "thr_a"]);
+    expect(
+      order(getSidebarThreadComparator({ sort: "created", direction: "asc" }), [
+        apple,
+        banana,
+        cherry,
+      ]),
+    ).toEqual(["thr_a", "thr_b", "thr_c"]);
+  });
+
+  it("updated: desc lists most recent first, asc inverts", () => {
+    expect(
+      order(getSidebarThreadComparator({ sort: "updated", direction: "desc" }), [
+        apple,
+        banana,
+        cherry,
+      ]),
+    ).toEqual(["thr_c", "thr_b", "thr_a"]);
+    expect(
+      order(getSidebarThreadComparator({ sort: "updated", direction: "asc" }), [
+        apple,
+        banana,
+        cherry,
+      ]),
+    ).toEqual(["thr_a", "thr_b", "thr_c"]);
+  });
+
+  it("alpha: asc is A→Z and desc is Z→A", () => {
+    expect(
+      order(getSidebarThreadComparator({ sort: "alpha", direction: "asc" }), [
+        cherry,
+        apple,
+        banana,
+      ]),
+    ).toEqual(["thr_a", "thr_b", "thr_c"]);
+    expect(
+      order(getSidebarThreadComparator({ sort: "alpha", direction: "desc" }), [
+        apple,
+        cherry,
+        banana,
+      ]),
+    ).toEqual(["thr_c", "thr_b", "thr_a"]);
+  });
+
+  // Regression: leaf threads and mixed folder/thread items must sort the same
+  // direction, or folders and threads appear in opposite alphabetical order.
+  it("alpha: leaf and item comparators agree in direction", () => {
+    for (const direction of ["asc", "desc"] as const) {
+      const comparator = getSidebarThreadComparator({ sort: "alpha", direction });
+      expect(comparator.compareItems).toBeDefined();
+      const leafSign = Math.sign(comparator(apple, banana));
+      const itemSign = Math.sign(
+        comparator.compareItems!(threadItem(apple), threadItem(banana)),
+      );
+      expect(itemSign).toBe(leafSign);
+    }
+  });
+});

From ef440e2f26a22070644755a19369d0d7b8e41d02 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:52:04 -0700
Subject: [PATCH 40/54] Preview + auto-expand folders when dragging a thread in

Dragging a thread onto a folder now reads as a real drop:

- onDragOver resolves the target folder (shared with onDragEnd so they agree),
  expands it if collapsed, and records a drag preview.
- The hovered folder renders an optimistic, non-interactive row for the dragged
  thread inside it (forcing the children area open) so there's a visible target
  to drop onto before the move commits.
- Preview/auto-expand apply only to real folders (not the loose root) and clear
  on drop/cancel; state updates are guarded so drag-over doesn't thrash renders.

useSidebarReorderDnd now forwards onDragStart/onDragOver/onDragCancel.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/components/sidebar/ProjectRow.tsx | 250 +++++++++++++-----
 .../sidebar/useSidebarReorderDnd.ts           |  22 +-
 2 files changed, 202 insertions(+), 70 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index a3c5d9ff7..715dfce9d 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -2,13 +2,20 @@ import {
   memo,
   useCallback,
   useMemo,
+  useRef,
   useState,
   type CSSProperties,
   type MouseEventHandler,
   type ReactNode,
 } from "react";
 import { useAtomValue, useSetAtom } from "jotai";
-import { DndContext, useDroppable, type DragEndEvent } from "@dnd-kit/core";
+import {
+  DndContext,
+  useDroppable,
+  type DragEndEvent,
+  type DragOverEvent,
+  type DragStartEvent,
+} from "@dnd-kit/core";
 import {
   SortableContext,
   verticalListSortingStrategy,
@@ -269,12 +276,21 @@ interface FolderTreeItemRowProps {
   sortableStyle?: CSSProperties;
 }
 
+// While a thread is dragged over a folder, the folder renders an optimistic
+// preview row for that thread (and is auto-expanded) so it reads as the drop
+// target before the move is committed.
+interface FolderDragPreview {
+  thread: ThreadListEntry;
+  overFolderKey: string;
+}
+
 interface ManualThreadTreeDndState {
   consumeClickSuppression: ConsumeDragClickSuppression;
   dndContextProps: SidebarReorderDndContextProps;
   enabled: boolean;
   itemIdsByParentKey: ReadonlyMap<string, readonly string[]>;
   onClickCapture: MouseEventHandler<HTMLElement>;
+  dragPreview: FolderDragPreview | null;
 }
 
 interface UseManualThreadTreeDndArgs {
@@ -374,6 +390,40 @@ function hasFolderItems(items: readonly ProjectThreadItem[]): boolean {
   );
 }
 
+// Resolve where a dragged thread would land. Shared by drag-over (preview +
+// auto-expand) and drag-end (the move) so they never disagree. `toParentKey`
+// is the destination folder key, or the container id for the loose root.
+function resolveThreadDropTarget(
+  lookup: ManualThreadTreeLookup,
+  active: DragEndEvent["active"],
+  over: DragEndEvent["over"],
+): { activeId: string; fromParentKey: string; toParentKey: string } | null {
+  if (!over || typeof active.id !== "string" || typeof over.id !== "string") {
+    return null;
+  }
+  const activeId = active.id;
+  const overId = over.id;
+  if (activeId === overId) return null;
+
+  const activeKind = lookup.itemKindById.get(activeId);
+  const overKind = lookup.itemKindById.get(overId);
+  const fromParentKey = lookup.parentKeyByItemId.get(activeId);
+  if (activeKind !== "thread" || !fromParentKey) return null;
+
+  let toParentKey = overKind
+    ? lookup.parentKeyByItemId.get(overId)
+    : undefined;
+  if (!overKind && lookup.folderPathByParentKey.has(overId)) {
+    // Dropping on a folder's child area (the droppable parent).
+    toParentKey = overId;
+  } else if (overKind === "folder") {
+    // Dropping on a folder header means "move into this folder".
+    toParentKey = overId;
+  }
+  if (!toParentKey || fromParentKey === toParentKey) return null;
+  return { activeId, fromParentKey, toParentKey };
+}
+
 function useManualThreadTreeDnd({
   containerId,
   enabled,
@@ -384,63 +434,86 @@ function useManualThreadTreeDnd({
     [containerId, rootItems],
   );
   const updateThread = useUpdateThread();
+  const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
+  const activeThreadRef = useRef<ThreadListEntry | null>(null);
+  const [dragPreview, setDragPreview] = useState<FolderDragPreview | null>(null);
+
+  const handleDragStart = useCallback(
+    (event: DragStartEvent) => {
+      const activeId = event.active.id;
+      activeThreadRef.current =
+        typeof activeId === "string"
+          ? (lookup.threadByItemId.get(activeId) ?? null)
+          : null;
+      setDragPreview(null);
+    },
+    [lookup],
+  );
 
-  const handleDragEnd = useCallback(
-    (event: DragEndEvent) => {
+  const handleDragOver = useCallback(
+    (event: DragOverEvent) => {
       if (!enabled) return;
-
-      const { active, over } = event;
-      if (
-        !over ||
-        typeof active.id !== "string" ||
-        typeof over.id !== "string"
-      ) {
-        return;
-      }
-
-      const activeId = active.id;
-      const overId = over.id;
-      if (activeId === overId) return;
-
-      const activeKind = lookup.itemKindById.get(activeId);
-      const overKind = lookup.itemKindById.get(overId);
-      const fromParentKey = lookup.parentKeyByItemId.get(activeId);
-
-      if (!activeKind || !fromParentKey) {
+      const thread = activeThreadRef.current;
+      if (!thread) return;
+      const drop = resolveThreadDropTarget(lookup, event.active, event.over);
+      // Only a real folder (not the loose root) gets a preview + auto-expand.
+      if (!drop || drop.toParentKey === containerId) {
+        setDragPreview((current) => (current ? null : current));
         return;
       }
+      const overFolderKey = drop.toParentKey;
+      // Expand a collapsed target so its contents — and the preview row —
+      // are visible to drop into. No-op if already expanded.
+      setCollapsedFolders((current) =>
+        current.includes(overFolderKey)
+          ? current.filter((key) => key !== overFolderKey)
+          : current,
+      );
+      setDragPreview((current) =>
+        current?.overFolderKey === overFolderKey &&
+        current.thread.id === thread.id
+          ? current
+          : { thread, overFolderKey },
+      );
+    },
+    [containerId, enabled, lookup, setCollapsedFolders],
+  );
 
-      let toParentKey = overKind
-        ? lookup.parentKeyByItemId.get(overId)
-        : undefined;
-      if (!overKind && lookup.folderPathByParentKey.has(overId)) {
-        toParentKey = overId;
-      } else if (activeKind === "thread" && overKind === "folder") {
-        // Dropping a thread on a folder header means "move into this folder".
-        toParentKey = overId;
-      }
-
-      if (!toParentKey) {
-        return;
-      }
+  const handleDragEnd = useCallback(
+    (event: DragEndEvent) => {
+      activeThreadRef.current = null;
+      setDragPreview(null);
+      if (!enabled) return;
 
-      if (activeKind !== "thread" || fromParentKey === toParentKey) {
-        return;
-      }
+      const drop = resolveThreadDropTarget(lookup, event.active, event.over);
+      if (!drop) return;
 
-      const thread = lookup.threadByItemId.get(activeId);
+      const thread = lookup.threadByItemId.get(drop.activeId);
       if (!thread) return;
 
       const destinationFolderPath = normalizeFolderPath(
-        (lookup.folderPathByParentKey.get(toParentKey) ?? []).join("/"),
+        (lookup.folderPathByParentKey.get(drop.toParentKey) ?? []).join("/"),
       );
-      updateThread.mutate({ id: activeId, folderPath: destinationFolderPath });
+      updateThread.mutate({
+        id: drop.activeId,
+        folderPath: destinationFolderPath,
+      });
     },
     [enabled, lookup, updateThread],
   );
 
+  const handleDragCancel = useCallback(() => {
+    activeThreadRef.current = null;
+    setDragPreview(null);
+  }, []);
+
   const { consumeClickSuppression, dndContextProps, onClickCapture } =
-    useSidebarReorderDnd({ onDragEnd: handleDragEnd });
+    useSidebarReorderDnd({
+      onDragEnd: handleDragEnd,
+      onDragStart: handleDragStart,
+      onDragOver: handleDragOver,
+      onDragCancel: handleDragCancel,
+    });
 
   if (!enabled) {
     return null;
@@ -452,6 +525,7 @@ function useManualThreadTreeDnd({
     enabled,
     itemIdsByParentKey: lookup.itemIdsByParentKey,
     onClickCapture,
+    dragPreview,
   };
 }
 
@@ -1349,6 +1423,31 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
 // in sidebarCollapsedFoldersAtom — read here rather than threaded so the rest of
 // the tree's prop wiring and memo equality stay untouched. Children render one
 // depth deeper and, when threads, show their leaf via insideFolder.
+// Non-interactive placeholder for the thread being dragged into a folder,
+// rendered inside the (auto-expanded) folder so it reads as the drop target.
+function FolderDropPreviewRow({
+  depth,
+  title,
+}: {
+  depth: number;
+  title: string;
+}) {
+  return (
+    <div
+      aria-hidden="true"
+      data-sidebar-folder-drop-preview="true"
+      style={{ paddingLeft: getSidebarThreadRowPaddingLeft(depth) }}
+      className={cn(
+        SIDEBAR_ROW_BASE_CLASS,
+        COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
+        "pointer-events-none border border-dashed border-sidebar-border bg-sidebar-accent/40 text-sidebar-accent-foreground",
+      )}
+    >
+      <span className="min-w-0 truncate opacity-80">{title}</span>
+    </div>
+  );
+}
+
 const FolderTreeItemRow = memo(function FolderTreeItemRow({
   folder,
   depthOffset,
@@ -1386,6 +1485,13 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   const stickyLevel =
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
   const folderPath = folder.path.join("/");
+  const dragPreview = manualSort?.dragPreview ?? null;
+  const previewThread =
+    dragPreview?.overFolderKey === folderKey ? dragPreview.thread : null;
+  const showChildren = !isCollapsed && folder.items.length > 0;
+  // Force the children area open while a thread is dragged over this folder so
+  // the optimistic drop-preview row is visible even when empty/collapsed.
+  const showChildrenArea = showChildren || previewThread !== null;
 
   return (
     <SidebarStickyGroup
@@ -1421,32 +1527,44 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
         onToggleCollapsed={handleToggleCollapsed}
         stickyLevel={stickyLevel}
       />
-      {!isCollapsed && folder.items.length > 0 ? (
+      {showChildrenArea ? (
         <div className="relative space-y-px">
           <ThreadTreeGroupLine parentRowDepth={headerDepth} />
-          <ManualSortableList manualSort={manualSort} parentKey={folder.key}>
-            {folder.items.map((item) => (
-              <ManualSortableThreadTreeItemRow
-                key={getItemKey(item)}
-                projectId={getItemProjectId(item)}
-                item={item}
-                depthOffset={depthOffset + 1}
-                insideFolder
-                selectedThreadId={selectedThreadId}
-                collapsedThreadIds={collapsedThreadIds}
-                collapsedEnvironmentIds={collapsedEnvironmentIds}
-                variant={variant}
-                onProjectSelect={onProjectSelect}
-                onCreateThreadInFolder={onCreateThreadInFolder}
-                onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
-                onRenameFolder={onRenameFolder}
-                onRemoveFolder={onRemoveFolder}
-                onToggleThreadCollapsed={onToggleThreadCollapsed}
-                onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-                manualSort={manualSort}
-              />
-            ))}
-          </ManualSortableList>
+          {showChildren ? (
+            <ManualSortableList manualSort={manualSort} parentKey={folder.key}>
+              {folder.items.map((item) => (
+                <ManualSortableThreadTreeItemRow
+                  key={getItemKey(item)}
+                  projectId={getItemProjectId(item)}
+                  item={item}
+                  depthOffset={depthOffset + 1}
+                  insideFolder
+                  selectedThreadId={selectedThreadId}
+                  collapsedThreadIds={collapsedThreadIds}
+                  collapsedEnvironmentIds={collapsedEnvironmentIds}
+                  variant={variant}
+                  onProjectSelect={onProjectSelect}
+                  onCreateThreadInFolder={onCreateThreadInFolder}
+                  onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
+                  onRenameFolder={onRenameFolder}
+                  onRemoveFolder={onRemoveFolder}
+                  onToggleThreadCollapsed={onToggleThreadCollapsed}
+                  onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+                  manualSort={manualSort}
+                />
+              ))}
+            </ManualSortableList>
+          ) : null}
+          {previewThread ? (
+            <FolderDropPreviewRow
+              depth={getThreadRowDepth({
+                depthOffset: depthOffset + 1,
+                nodeDepth: 0,
+                variant,
+              })}
+              title={getThreadDisplayTitle(previewThread)}
+            />
+          ) : null}
         </div>
       ) : null}
     </SidebarStickyGroup>
diff --git a/apps/app/src/components/sidebar/useSidebarReorderDnd.ts b/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
index 4ec9a2d91..5ccd3e30a 100644
--- a/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
+++ b/apps/app/src/components/sidebar/useSidebarReorderDnd.ts
@@ -10,6 +10,7 @@ import {
   type CollisionDetection,
   type DndContextProps,
   type DragEndEvent,
+  type DragOverEvent,
   type DragStartEvent,
   type Modifier,
 } from "@dnd-kit/core";
@@ -47,6 +48,12 @@ export interface UseSidebarReorderDndArgs {
    * suppression timer before invoking it, so callers only own the reorder.
    */
   onDragEnd: (event: DragEndEvent) => void;
+  /** Runs alongside the internal drag-click suppression on drag start. */
+  onDragStart?: (event: DragStartEvent) => void;
+  /** Live drag-over tracking (e.g. to preview/expand a hovered folder). */
+  onDragOver?: (event: DragOverEvent) => void;
+  /** Runs alongside the internal suppression reset when a drag is cancelled. */
+  onDragCancel?: () => void;
 }
 
 export type SidebarReorderDndContextProps = Pick<
@@ -54,6 +61,7 @@ export type SidebarReorderDndContextProps = Pick<
   | "sensors"
   | "collisionDetection"
   | "onDragStart"
+  | "onDragOver"
   | "onDragCancel"
   | "onDragEnd"
   | "modifiers"
@@ -79,6 +87,9 @@ export interface UseSidebarReorderDndResult {
  */
 export function useSidebarReorderDnd({
   onDragEnd,
+  onDragStart,
+  onDragOver,
+  onDragCancel,
 }: UseSidebarReorderDndArgs): UseSidebarReorderDndResult {
   const {
     beginDragClickSuppression,
@@ -95,14 +106,16 @@ export function useSidebarReorderDnd({
     }),
   );
   const handleDragStart = useCallback(
-    (_event: DragStartEvent) => {
+    (event: DragStartEvent) => {
       beginDragClickSuppression();
+      onDragStart?.(event);
     },
-    [beginDragClickSuppression],
+    [beginDragClickSuppression, onDragStart],
   );
   const handleDragCancel = useCallback(() => {
     clearDragClickSuppressionSoon();
-  }, [clearDragClickSuppressionSoon]);
+    onDragCancel?.();
+  }, [clearDragClickSuppressionSoon, onDragCancel]);
   const handleDragEnd = useCallback(
     (event: DragEndEvent) => {
       clearDragClickSuppressionSoon();
@@ -126,10 +139,11 @@ export function useSidebarReorderDnd({
       collisionDetection: sidebarReorderCollisionDetection,
       modifiers: SIDEBAR_REORDER_MODIFIERS,
       onDragStart: handleDragStart,
+      onDragOver,
       onDragCancel: handleDragCancel,
       onDragEnd: handleDragEnd,
     }),
-    [handleDragCancel, handleDragEnd, handleDragStart, sensors],
+    [handleDragCancel, handleDragEnd, handleDragStart, onDragOver, sensors],
   );
 
   return {

From 8da22a8c5eff2e3a44fd7bce2694cb753775787f Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 16:56:33 -0700
Subject: [PATCH 41/54] Show only the warning icon on a path-missing project
 row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a project's local path is missing, the row now renders just the red
warning icon (flush right) instead of also showing the actions menu and new
thread button — the warning is the single relevant action (open settings to
fix). Normal rows keep the "..." + "+" actions. Right-click context menu is
unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/components/sidebar/ProjectRow.tsx | 117 +++++++++---------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 715dfce9d..a98c608fc 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -410,9 +410,7 @@ function resolveThreadDropTarget(
   const fromParentKey = lookup.parentKeyByItemId.get(activeId);
   if (activeKind !== "thread" || !fromParentKey) return null;
 
-  let toParentKey = overKind
-    ? lookup.parentKeyByItemId.get(overId)
-    : undefined;
+  let toParentKey = overKind ? lookup.parentKeyByItemId.get(overId) : undefined;
   if (!overKind && lookup.folderPathByParentKey.has(overId)) {
     // Dropping on a folder's child area (the droppable parent).
     toParentKey = overId;
@@ -436,7 +434,9 @@ function useManualThreadTreeDnd({
   const updateThread = useUpdateThread();
   const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
   const activeThreadRef = useRef<ThreadListEntry | null>(null);
-  const [dragPreview, setDragPreview] = useState<FolderDragPreview | null>(null);
+  const [dragPreview, setDragPreview] = useState<FolderDragPreview | null>(
+    null,
+  );
 
   const handleDragStart = useCallback(
     (event: DragStartEvent) => {
@@ -2161,61 +2161,42 @@ function ProjectRowComponent({
                   Open project settings
                 </TooltipContent>
               </Tooltip>
-            ) : null}
-            <span
-              data-sidebar-hover-actions-open={
-                isActionsOpen ? "true" : undefined
-              }
-              data-sidebar-hover-actions-mobile={
-                SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
-              }
-              className={cn(
-                SIDEBAR_HOVER_ACTIONS_CLASS,
-                "relative z-10 inline-flex shrink-0 items-center",
-                SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
-              )}
-            >
-              <ProjectActionsMenu
-                project={project}
-                onOpenChange={setIsDropdownActionsOpen}
-                triggerClassName={cn(
-                  "relative z-10 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+            ) : (
+              <span
+                data-sidebar-hover-actions-open={
+                  isActionsOpen ? "true" : undefined
+                }
+                data-sidebar-hover-actions-mobile={
+                  SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
+                }
+                className={cn(
+                  SIDEBAR_HOVER_ACTIONS_CLASS,
+                  "relative z-10 inline-flex shrink-0 items-center",
+                  SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
                 )}
-              />
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  {onCreateProjectThread ? (
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="icon"
-                      aria-label={`New thread in ${project.name}`}
-                      title={undefined}
-                      disabled={!onCreateProjectThread}
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        handleCreateThread();
-                      }}
-                      className={cn(
-                        "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                        COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                      )}
-                    >
-                      <Icon
-                        name="MessageSquarePlus"
-                        className={COARSE_POINTER_ICON_SIZE_CLASS}
-                      />
-                    </Button>
-                  ) : (
-                    <span className="inline-flex">
+              >
+                <ProjectActionsMenu
+                  project={project}
+                  onOpenChange={setIsDropdownActionsOpen}
+                  triggerClassName={cn(
+                    "relative z-10 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                    COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                  )}
+                />
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    {onCreateProjectThread ? (
                       <Button
                         type="button"
                         variant="ghost"
                         size="icon"
                         aria-label={`New thread in ${project.name}`}
                         title={undefined}
-                        disabled
+                        disabled={!onCreateProjectThread}
+                        onClick={(event) => {
+                          event.stopPropagation();
+                          handleCreateThread();
+                        }}
                         className={cn(
                           "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
                           COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
@@ -2226,12 +2207,32 @@ function ProjectRowComponent({
                           className={COARSE_POINTER_ICON_SIZE_CLASS}
                         />
                       </Button>
-                    </span>
-                  )}
-                </TooltipTrigger>
-                <TooltipContent side="bottom">New thread</TooltipContent>
-              </Tooltip>
-            </span>
+                    ) : (
+                      <span className="inline-flex">
+                        <Button
+                          type="button"
+                          variant="ghost"
+                          size="icon"
+                          aria-label={`New thread in ${project.name}`}
+                          title={undefined}
+                          disabled
+                          className={cn(
+                            "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                            COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                          )}
+                        >
+                          <Icon
+                            name="MessageSquarePlus"
+                            className={COARSE_POINTER_ICON_SIZE_CLASS}
+                          />
+                        </Button>
+                      </span>
+                    )}
+                  </TooltipTrigger>
+                  <TooltipContent side="bottom">New thread</TooltipContent>
+                </Tooltip>
+              </span>
+            )}
           </SidebarStickyTier>
         </ProjectActionsContextMenu>
 

From 7b4e57ddfe0b89f0d3fd9c25dc458f9539a225c3 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 17:05:24 -0700
Subject: [PATCH 42/54] Share sidebar header actions across project and folders
 views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Threads header in the folders view was missing the Organize/Sort actions,
and each view defined its own near-duplicate action clusters. Extract shared
components so the headers can't drift:

- SidebarDisplayOptionsActions: the Organize + Sort menu pair, used by the
  Projects, Folders, and Threads headers.
- SidebarThreadsSectionActions: the full Threads-header cluster (archived menu
  + display options + new thread), used by the Threads header in BOTH project
  mode and the folders view — so it now has Organize/Sort there too.

Rebalanced the two display-menu open states so each mode's two sections own one
("primary": Projects/Folders, plus Threads) and stay independent.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/components/sidebar/ProjectList.tsx    | 172 +++++++++++-------
 1 file changed, 102 insertions(+), 70 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 22ecf4b6e..04a1aca32 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -511,7 +511,9 @@ export function getSidebarThreadComparator({
       direction === "asc"
         ? compareProjectThreadItemsByTitleAscending
         : (left, right) =>
-            invertNumber(compareProjectThreadItemsByTitleAscending(left, right));
+            invertNumber(
+              compareProjectThreadItemsByTitleAscending(left, right),
+            );
     return comparator;
   }
 
@@ -733,10 +735,7 @@ export function SidebarOrganizeOptionsMenu({
         iconName="Layers"
         tooltip="Organize"
       />
-      <DropdownMenuContent
-        align="end"
-        mobileTitle="Organize sidebar"
-      >
+      <DropdownMenuContent align="end" mobileTitle="Organize sidebar">
         <DropdownMenuLabel>Organize by</DropdownMenuLabel>
         <SidebarOrganizeMenuOption
           label="Project"
@@ -856,10 +855,7 @@ function SidebarThreadActionsMenu({
         </TooltipTrigger>
         <TooltipContent side="bottom">Threads actions</TooltipContent>
       </Tooltip>
-      <DropdownMenuContent
-        align="end"
-        mobileTitle="Threads actions"
-      >
+      <DropdownMenuContent align="end" mobileTitle="Threads actions">
         <DropdownMenuItem onSelect={onOpenArchivedThreads}>
           View archived threads
         </DropdownMenuItem>
@@ -868,6 +864,79 @@ function SidebarThreadActionsMenu({
   );
 }
 
+interface SidebarDisplayOptionsActionsProps {
+  open: SidebarDisplayOptionsMenuKind | null;
+  onOpenChange: (menu: SidebarDisplayOptionsMenuKind, open: boolean) => void;
+  onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
+}
+
+// The Organize + Sort menu pair shown on every sidebar section header. Shared
+// so the project, folders, and threads headers stay identical and changes land
+// in one place instead of being copied per view.
+function SidebarDisplayOptionsActions({
+  open,
+  onOpenChange,
+  onOrganizationModeSelect,
+}: SidebarDisplayOptionsActionsProps) {
+  return (
+    <>
+      <SidebarOrganizeOptionsMenu
+        open={open === "organize"}
+        onOpenChange={(next) => onOpenChange("organize", next)}
+        onOrganizationModeSelect={onOrganizationModeSelect}
+      />
+      <SidebarSortOptionsMenu
+        open={open === "sort"}
+        onOpenChange={(next) => onOpenChange("sort", next)}
+      />
+    </>
+  );
+}
+
+interface SidebarThreadsSectionActionsProps {
+  displayOptionsOpen: SidebarDisplayOptionsMenuKind | null;
+  onDisplayOptionsOpenChange: (
+    menu: SidebarDisplayOptionsMenuKind,
+    open: boolean,
+  ) => void;
+  isActionsMenuOpen: boolean;
+  onActionsMenuOpenChange: (open: boolean) => void;
+  onOpenArchivedThreads?: () => void;
+  isCreatingFolder: boolean;
+  onNewThread: () => void;
+}
+
+// The complete Threads-section header cluster (archived menu + display options +
+// new thread). One component drives the Threads header in both project mode and
+// the folders view, so they can never drift apart.
+function SidebarThreadsSectionActions({
+  displayOptionsOpen,
+  onDisplayOptionsOpenChange,
+  isActionsMenuOpen,
+  onActionsMenuOpenChange,
+  onOpenArchivedThreads,
+  isCreatingFolder,
+  onNewThread,
+}: SidebarThreadsSectionActionsProps) {
+  return (
+    <>
+      <SidebarThreadActionsMenu
+        open={isActionsMenuOpen}
+        onOpenChange={onActionsMenuOpenChange}
+        onOpenArchivedThreads={onOpenArchivedThreads}
+      />
+      <SidebarDisplayOptionsActions
+        open={displayOptionsOpen}
+        onOpenChange={onDisplayOptionsOpenChange}
+      />
+      <ProjectListThreadsSectionActions
+        isCreatingFolder={isCreatingFolder}
+        onNewThread={onNewThread}
+      />
+    </>
+  );
+}
+
 export function ProjectListNavigationLoadingState() {
   return (
     <div
@@ -1869,23 +1938,18 @@ function ProjectListComponent({
       onToggleEnvironmentCollapsed={toggleEnvironmentCollapsed}
     />
   );
+  // The "primary" section (Projects in project mode, Folders in the folders
+  // view) and the Threads section each own one display-options menu state, so
+  // both can be open independently — and never both at once across sections.
   const projectsSectionActions = (
     <>
-      <SidebarOrganizeOptionsMenu
-        open={projectsDisplayOptionsMenuOpen === "organize"}
-        onOpenChange={(open) =>
-          handleProjectsDisplayOptionsMenuOpenChange("organize", open)
-        }
+      <SidebarDisplayOptionsActions
+        open={projectsDisplayOptionsMenuOpen}
+        onOpenChange={handleProjectsDisplayOptionsMenuOpenChange}
         onOrganizationModeSelect={
           handleProjectsViewOptionsOrganizationModeSelect
         }
       />
-      <SidebarSortOptionsMenu
-        open={projectsDisplayOptionsMenuOpen === "sort"}
-        onOpenChange={(open) =>
-          handleProjectsDisplayOptionsMenuOpenChange("sort", open)
-        }
-      />
       {onNewProject ? (
         <ProjectListProjectsSectionActions
           onNewProject={onNewProject}
@@ -1898,17 +1962,9 @@ function ProjectListComponent({
     projectsState.status === "ready" && renderedProjects.length === 0;
   const folderSectionActions = (
     <>
-      <SidebarOrganizeOptionsMenu
-        open={threadsDisplayOptionsMenuOpen === "organize"}
-        onOpenChange={(open) =>
-          handleThreadsDisplayOptionsMenuOpenChange("organize", open)
-        }
-      />
-      <SidebarSortOptionsMenu
-        open={threadsDisplayOptionsMenuOpen === "sort"}
-        onOpenChange={(open) =>
-          handleThreadsDisplayOptionsMenuOpenChange("sort", open)
-        }
+      <SidebarDisplayOptionsActions
+        open={projectsDisplayOptionsMenuOpen}
+        onOpenChange={handleProjectsDisplayOptionsMenuOpenChange}
       />
       <ProjectListSectionIconButton
         ariaLabel="New folder"
@@ -1919,43 +1975,17 @@ function ProjectListComponent({
       />
     </>
   );
-  const folderModeThreadsSectionActions = (
-    <>
-      <SidebarThreadActionsMenu
-        open={isThreadsActionsMenuOpen}
-        onOpenChange={handleThreadsActionsMenuOpenChange}
-        onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
-      />
-      <ProjectListThreadsSectionActions
-        isCreatingFolder={isCreateThreadFolderPending}
-        onNewThread={handleCreateProjectlessThread}
-      />
-    </>
-  );
+  // One Threads-header cluster shared by project mode and the folders view.
   const threadsSectionActions = (
-    <>
-      <SidebarThreadActionsMenu
-        open={isThreadsActionsMenuOpen}
-        onOpenChange={handleThreadsActionsMenuOpenChange}
-        onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
-      />
-      <SidebarOrganizeOptionsMenu
-        open={threadsDisplayOptionsMenuOpen === "organize"}
-        onOpenChange={(open) =>
-          handleThreadsDisplayOptionsMenuOpenChange("organize", open)
-        }
-      />
-      <SidebarSortOptionsMenu
-        open={threadsDisplayOptionsMenuOpen === "sort"}
-        onOpenChange={(open) =>
-          handleThreadsDisplayOptionsMenuOpenChange("sort", open)
-        }
-      />
-      <ProjectListThreadsSectionActions
-        isCreatingFolder={isCreateThreadFolderPending}
-        onNewThread={handleCreateProjectlessThread}
-      />
-    </>
+    <SidebarThreadsSectionActions
+      displayOptionsOpen={threadsDisplayOptionsMenuOpen}
+      onDisplayOptionsOpenChange={handleThreadsDisplayOptionsMenuOpenChange}
+      isActionsMenuOpen={isThreadsActionsMenuOpen}
+      onActionsMenuOpenChange={handleThreadsActionsMenuOpenChange}
+      onOpenArchivedThreads={handleOpenProjectlessArchivedThreads}
+      isCreatingFolder={isCreateThreadFolderPending}
+      onNewThread={handleCreateProjectlessThread}
+    />
   );
   const folderModeSectionsContent = (
     <ChronologicalFolderThreadSections
@@ -1976,7 +2006,7 @@ function ProjectListComponent({
         <TopLevelSidebarSection
           label="Folders"
           actions={folderSectionActions}
-          actionsOpen={threadsDisplayOptionsMenuOpen !== null}
+          actionsOpen={projectsDisplayOptionsMenuOpen !== null}
           actionsMobileAlways
         >
           {content}
@@ -1985,8 +2015,10 @@ function ProjectListComponent({
       renderThreadsSection={(content) => (
         <TopLevelSidebarSection
           label="Threads"
-          actions={folderModeThreadsSectionActions}
-          actionsOpen={isThreadsActionsMenuOpen}
+          actions={threadsSectionActions}
+          actionsOpen={
+            isThreadsActionsMenuOpen || threadsDisplayOptionsMenuOpen !== null
+          }
           actionsMobileAlways
           collapseControl={{
             isCollapsed: collapsedSidebarSectionIds.has("threads"),

From 6e3ae9f2b19abfe58476e13f7f4994d7f60d84c2 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 17:12:29 -0700
Subject: [PATCH 43/54] Render every sidebar thread list through one shared
 component
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ProjectThreadTree, ChronologicalThreadTree, and the Folders view each had their
own near-identical copy of "group + sortable list + map item rows" plus the
loading skeleton, so every row-prop change had to be repeated per view.

- Add ManualThreadTreeItems: the single place that maps thread-tree items to
  rows. Variants via props — fixed vs per-item projectId, and an optional
  sortableParentKey (wrap in a SortableContext, or let an outer one provide it
  for the split Folders/Threads view).
- Add ThreadTreeLoadingSkeleton for the repeated loading state.
- Route all three renderers through them.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/components/sidebar/ProjectRow.tsx | 222 +++++++++++-------
 1 file changed, 135 insertions(+), 87 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index a98c608fc..004818408 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -1696,6 +1696,98 @@ export const ThreadTreeNodeRow = memo(function ThreadTreeNodeRow({
   );
 });
 
+function ThreadTreeLoadingSkeleton() {
+  return (
+    <div className="group-data-[collapsible=icon]:hidden">
+      <SidebarMenuSkeleton />
+    </div>
+  );
+}
+
+interface ManualThreadTreeItemsProps {
+  items: readonly ProjectThreadItem[];
+  manualSort: ManualThreadTreeDndState | null;
+  variant: ProjectThreadTreeVariant;
+  // Route every row to this project; omit to derive each row's project from its
+  // own thread (the cross-project Folders view).
+  projectId?: string;
+  depthOffset?: number;
+  // Wrap the rows in a SortableContext for this parent. Omit when an outer
+  // SortableList already provides the context (the split Folders/Threads view).
+  sortableParentKey?: string;
+  selectedThreadId?: string;
+  collapsedThreadIds: Set<string>;
+  collapsedEnvironmentIds: Set<string>;
+  onProjectSelect?: () => void;
+  onToggleThreadCollapsed: (threadId: string) => void;
+  onToggleEnvironmentCollapsed: (environmentId: string) => void;
+  onCreateThreadInFolder?: (folderPath: string) => void;
+  onViewArchivedThreadsInFolder?: (folderPath: string) => void;
+  onRenameFolder?: (folderPath: string) => void;
+  onRemoveFolder?: (folderPath: string) => void;
+}
+
+// The one place that maps thread-tree items to rows. Every sidebar view
+// (project, flat chronological, folders) renders through this, so a row-prop
+// change lands once instead of being copied across each view's renderer.
+function ManualThreadTreeItems({
+  items,
+  manualSort,
+  variant,
+  projectId,
+  depthOffset = 0,
+  sortableParentKey,
+  selectedThreadId,
+  collapsedThreadIds,
+  collapsedEnvironmentIds,
+  onProjectSelect,
+  onToggleThreadCollapsed,
+  onToggleEnvironmentCollapsed,
+  onCreateThreadInFolder,
+  onViewArchivedThreadsInFolder,
+  onRenameFolder,
+  onRemoveFolder,
+}: ManualThreadTreeItemsProps) {
+  const rows = items.map((item) => (
+    <ManualSortableThreadTreeItemRow
+      key={getItemKey(item)}
+      projectId={projectId ?? getItemProjectId(item)}
+      item={item}
+      depthOffset={depthOffset}
+      selectedThreadId={selectedThreadId}
+      collapsedThreadIds={collapsedThreadIds}
+      collapsedEnvironmentIds={collapsedEnvironmentIds}
+      variant={variant}
+      onProjectSelect={onProjectSelect}
+      onToggleThreadCollapsed={onToggleThreadCollapsed}
+      onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+      onCreateThreadInFolder={onCreateThreadInFolder}
+      onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
+      onRenameFolder={onRenameFolder}
+      onRemoveFolder={onRemoveFolder}
+      manualSort={manualSort ?? undefined}
+    />
+  ));
+
+  return (
+    <ProjectThreadTreeGroup
+      variant={variant}
+      onClickCapture={manualSort?.onClickCapture}
+    >
+      {sortableParentKey !== undefined ? (
+        <ManualSortableList
+          manualSort={manualSort}
+          parentKey={sortableParentKey}
+        >
+          {rows}
+        </ManualSortableList>
+      ) : (
+        rows
+      )}
+    </ProjectThreadTreeGroup>
+  );
+}
+
 export const ProjectThreadTree = memo(function ProjectThreadTree({
   projectId,
   threadListState,
@@ -1730,11 +1822,7 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   });
 
   if (threadListState.status === "loading") {
-    return (
-      <div className="group-data-[collapsible=icon]:hidden">
-        <SidebarMenuSkeleton />
-      </div>
-    );
+    return <ThreadTreeLoadingSkeleton />;
   }
 
   if (rootItems.length === 0) {
@@ -1766,29 +1854,19 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
   }
 
   const tree = (
-    <ProjectThreadTreeGroup
+    <ManualThreadTreeItems
+      items={rootItems}
+      manualSort={manualSort}
       variant={variant}
-      onClickCapture={manualSort?.onClickCapture}
-    >
-      <ManualSortableList manualSort={manualSort} parentKey={projectId}>
-        {rootItems.map((item) => (
-          <ManualSortableThreadTreeItemRow
-            key={getItemKey(item)}
-            projectId={projectId}
-            item={item}
-            depthOffset={0}
-            selectedThreadId={selectedThreadId}
-            collapsedThreadIds={collapsedThreadIds}
-            collapsedEnvironmentIds={collapsedEnvironmentIds}
-            variant={variant}
-            onProjectSelect={onProjectSelect}
-            onToggleThreadCollapsed={onToggleThreadCollapsed}
-            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-            manualSort={manualSort ?? undefined}
-          />
-        ))}
-      </ManualSortableList>
-    </ProjectThreadTreeGroup>
+      projectId={projectId}
+      sortableParentKey={projectId}
+      selectedThreadId={selectedThreadId}
+      collapsedThreadIds={collapsedThreadIds}
+      collapsedEnvironmentIds={collapsedEnvironmentIds}
+      onProjectSelect={onProjectSelect}
+      onToggleThreadCollapsed={onToggleThreadCollapsed}
+      onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+    />
   );
 
   return manualSort ? (
@@ -1835,11 +1913,7 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   });
 
   if (threadListState.status === "loading") {
-    return (
-      <div className="group-data-[collapsible=icon]:hidden">
-        <SidebarMenuSkeleton />
-      </div>
-    );
+    return <ThreadTreeLoadingSkeleton />;
   }
 
   if (rootItems.length === 0) {
@@ -1861,32 +1935,18 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
   }
 
   const tree = (
-    <ProjectThreadTreeGroup
+    <ManualThreadTreeItems
+      items={rootItems}
+      manualSort={manualSort}
       variant="section"
-      onClickCapture={manualSort?.onClickCapture}
-    >
-      <ManualSortableList
-        manualSort={manualSort}
-        parentKey={CHRONOLOGICAL_CONTAINER_ID}
-      >
-        {rootItems.map((item) => (
-          <ManualSortableThreadTreeItemRow
-            key={getItemKey(item)}
-            projectId={getItemProjectId(item)}
-            item={item}
-            depthOffset={0}
-            selectedThreadId={selectedThreadId}
-            collapsedThreadIds={collapsedThreadIds}
-            collapsedEnvironmentIds={collapsedEnvironmentIds}
-            variant="section"
-            onProjectSelect={onProjectSelect}
-            onToggleThreadCollapsed={onToggleThreadCollapsed}
-            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-            manualSort={manualSort ?? undefined}
-          />
-        ))}
-      </ManualSortableList>
-    </ProjectThreadTreeGroup>
+      sortableParentKey={CHRONOLOGICAL_CONTAINER_ID}
+      selectedThreadId={selectedThreadId}
+      collapsedThreadIds={collapsedThreadIds}
+      collapsedEnvironmentIds={collapsedEnvironmentIds}
+      onProjectSelect={onProjectSelect}
+      onToggleThreadCollapsed={onToggleThreadCollapsed}
+      onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+    />
   );
 
   return manualSort ? (
@@ -1936,39 +1996,29 @@ export const ChronologicalFolderThreadSections = memo(
     const folderItems = rootItems.filter((item) => item.kind === "folder");
     const looseItems = rootItems.filter((item) => item.kind !== "folder");
 
+    // No sortableParentKey: the outer ManualSortableList below provides the
+    // SortableContext spanning both the folders and loose-threads sections.
     const renderItems = (items: readonly ProjectThreadItem[]) => (
-      <ProjectThreadTreeGroup
+      <ManualThreadTreeItems
+        items={items}
+        manualSort={manualSort}
         variant="section"
-        onClickCapture={manualSort?.onClickCapture}
-      >
-        {items.map((item) => (
-          <ManualSortableThreadTreeItemRow
-            key={getItemKey(item)}
-            projectId={getItemProjectId(item)}
-            item={item}
-            depthOffset={0}
-            selectedThreadId={selectedThreadId}
-            collapsedThreadIds={collapsedThreadIds}
-            collapsedEnvironmentIds={collapsedEnvironmentIds}
-            variant="section"
-            onProjectSelect={onProjectSelect}
-            onCreateThreadInFolder={onCreateThreadInFolder}
-            onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
-            onRenameFolder={onRenameFolder}
-            onRemoveFolder={onRemoveFolder}
-            onToggleThreadCollapsed={onToggleThreadCollapsed}
-            onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
-            manualSort={manualSort ?? undefined}
-          />
-        ))}
-      </ProjectThreadTreeGroup>
+        selectedThreadId={selectedThreadId}
+        collapsedThreadIds={collapsedThreadIds}
+        collapsedEnvironmentIds={collapsedEnvironmentIds}
+        onProjectSelect={onProjectSelect}
+        onToggleThreadCollapsed={onToggleThreadCollapsed}
+        onToggleEnvironmentCollapsed={onToggleEnvironmentCollapsed}
+        onCreateThreadInFolder={onCreateThreadInFolder}
+        onViewArchivedThreadsInFolder={onViewArchivedThreadsInFolder}
+        onRenameFolder={onRenameFolder}
+        onRemoveFolder={onRemoveFolder}
+      />
     );
 
     const foldersContent =
       threadListState.status === "loading" ? (
-        <div className="group-data-[collapsible=icon]:hidden">
-          <SidebarMenuSkeleton />
-        </div>
+        <ThreadTreeLoadingSkeleton />
       ) : folderItems.length > 0 ? (
         renderItems(folderItems)
       ) : (
@@ -1988,9 +2038,7 @@ export const ChronologicalFolderThreadSections = memo(
       );
     const threadsListContent =
       threadListState.status === "loading" ? (
-        <div className="group-data-[collapsible=icon]:hidden">
-          <SidebarMenuSkeleton />
-        </div>
+        <ThreadTreeLoadingSkeleton />
       ) : looseItems.length > 0 ? (
         renderItems(looseItems)
       ) : (

From db083d2601514425830f4eaa75c6afa330459bf4 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 17:19:04 -0700
Subject: [PATCH 44/54] Spring-load folder drag preview/expand to stop the drag
 from sticking

Expanding the hovered folder and inserting the drop-preview row mid-drag shifted
layout under the in-flow dragged item, so dragging a thread up out of its folder
got shoved back down ("stuck"). Defer both behind a short hover dwell so passing
through a folder doesn't mutate layout; the expand + preview only fire once the
pointer settles over a target. Drop still works immediately regardless.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/components/sidebar/ProjectRow.tsx | 83 ++++++++++++++-----
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 004818408..c9b72f427 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -1,6 +1,7 @@
 import {
   memo,
   useCallback,
+  useEffect,
   useMemo,
   useRef,
   useState,
@@ -422,6 +423,12 @@ function resolveThreadDropTarget(
   return { activeId, fromParentKey, toParentKey };
 }
 
+// Spring-loaded delay before a hovered folder expands + shows the drop preview.
+// The preview/expand shift layout, so deferring them until the pointer settles
+// keeps dragging *through* a folder (e.g. up out of one's own folder) smooth
+// instead of the inserted row shoving the dragged item back down.
+const FOLDER_DRAG_DWELL_MS = 350;
+
 function useManualThreadTreeDnd({
   containerId,
   enabled,
@@ -434,10 +441,24 @@ function useManualThreadTreeDnd({
   const updateThread = useUpdateThread();
   const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
   const activeThreadRef = useRef<ThreadListEntry | null>(null);
+  const dwellTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  // The folder the dwell timer is currently counting toward (or showing a
+  // preview for); null when the pointer isn't over a droppable target folder.
+  const dwellFolderKeyRef = useRef<string | null>(null);
   const [dragPreview, setDragPreview] = useState<FolderDragPreview | null>(
     null,
   );
 
+  const clearFolderDwell = useCallback(() => {
+    if (dwellTimerRef.current !== null) {
+      clearTimeout(dwellTimerRef.current);
+      dwellTimerRef.current = null;
+    }
+    dwellFolderKeyRef.current = null;
+  }, []);
+
+  useEffect(() => clearFolderDwell, [clearFolderDwell]);
+
   const handleDragStart = useCallback(
     (event: DragStartEvent) => {
       const activeId = event.active.id;
@@ -445,9 +466,10 @@ function useManualThreadTreeDnd({
         typeof activeId === "string"
           ? (lookup.threadByItemId.get(activeId) ?? null)
           : null;
+      clearFolderDwell();
       setDragPreview(null);
     },
-    [lookup],
+    [clearFolderDwell, lookup],
   );
 
   const handleDragOver = useCallback(
@@ -456,32 +478,46 @@ function useManualThreadTreeDnd({
       const thread = activeThreadRef.current;
       if (!thread) return;
       const drop = resolveThreadDropTarget(lookup, event.active, event.over);
-      // Only a real folder (not the loose root) gets a preview + auto-expand.
-      if (!drop || drop.toParentKey === containerId) {
-        setDragPreview((current) => (current ? null : current));
-        return;
-      }
-      const overFolderKey = drop.toParentKey;
-      // Expand a collapsed target so its contents — and the preview row —
-      // are visible to drop into. No-op if already expanded.
-      setCollapsedFolders((current) =>
-        current.includes(overFolderKey)
-          ? current.filter((key) => key !== overFolderKey)
-          : current,
-      );
-      setDragPreview((current) =>
-        current?.overFolderKey === overFolderKey &&
-        current.thread.id === thread.id
-          ? current
-          : { thread, overFolderKey },
-      );
+      // Only a real folder (not the loose root) is a preview/expand target.
+      const targetFolderKey =
+        drop && drop.toParentKey !== containerId ? drop.toParentKey : null;
+
+      // Same target as the in-flight dwell/preview: nothing to do (don't
+      // thrash timers or layout on every pointer move).
+      if (targetFolderKey === dwellFolderKeyRef.current) return;
+
+      // Target changed: cancel the pending dwell and drop any shown preview.
+      clearFolderDwell();
+      dwellFolderKeyRef.current = targetFolderKey;
+      setDragPreview((current) => (current ? null : current));
+      if (targetFolderKey === null) return;
+
+      // Spring-loaded: expand + preview only after the pointer settles, so
+      // passing through a folder mid-drag doesn't shift it under the cursor.
+      dwellTimerRef.current = setTimeout(() => {
+        dwellTimerRef.current = null;
+        const draggingThread = activeThreadRef.current;
+        if (!draggingThread || dwellFolderKeyRef.current !== targetFolderKey) {
+          return;
+        }
+        setCollapsedFolders((current) =>
+          current.includes(targetFolderKey)
+            ? current.filter((key) => key !== targetFolderKey)
+            : current,
+        );
+        setDragPreview({
+          thread: draggingThread,
+          overFolderKey: targetFolderKey,
+        });
+      }, FOLDER_DRAG_DWELL_MS);
     },
-    [containerId, enabled, lookup, setCollapsedFolders],
+    [clearFolderDwell, containerId, enabled, lookup, setCollapsedFolders],
   );
 
   const handleDragEnd = useCallback(
     (event: DragEndEvent) => {
       activeThreadRef.current = null;
+      clearFolderDwell();
       setDragPreview(null);
       if (!enabled) return;
 
@@ -499,13 +535,14 @@ function useManualThreadTreeDnd({
         folderPath: destinationFolderPath,
       });
     },
-    [enabled, lookup, updateThread],
+    [clearFolderDwell, enabled, lookup, updateThread],
   );
 
   const handleDragCancel = useCallback(() => {
     activeThreadRef.current = null;
+    clearFolderDwell();
     setDragPreview(null);
-  }, []);
+  }, [clearFolderDwell]);
 
   const { consumeClickSuppression, dndContextProps, onClickCapture } =
     useSidebarReorderDnd({

From fc6d066ba2b38faf84644467bc2ec0afe172978a Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 17:37:25 -0700
Subject: [PATCH 45/54] Shorten folder drag-dwell to 200ms for a snappier
 spring-load

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/components/sidebar/ProjectRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index c9b72f427..367f3cc7f 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -427,7 +427,7 @@ function resolveThreadDropTarget(
 // The preview/expand shift layout, so deferring them until the pointer settles
 // keeps dragging *through* a folder (e.g. up out of one's own folder) smooth
 // instead of the inserted row shoving the dragged item back down.
-const FOLDER_DRAG_DWELL_MS = 350;
+const FOLDER_DRAG_DWELL_MS = 200;
 
 function useManualThreadTreeDnd({
   containerId,

From a448caac30592af0df40bcc351dd5e81597ef39e Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 17:54:09 -0700
Subject: [PATCH 46/54] Make folder drop placeholder an empty slot; add a story
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The drop preview duplicated the dragged thread's title (once in the injected
row, once on the natural dragged row). Keep the placeholder as the drop target
but render it empty — the dragged row carries the title, like dragging a queued
message. Folders still highlight and spring-open on hover; dropping onto the
loose Threads section (a droppable parent) clears the thread's folder.

Add a "Drag into" story for the drop-target highlight + empty placeholder.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/components/sidebar/ProjectRow.tsx | 99 ++++++++-----------
 .../sidebar/SidebarFolderRow.stories.tsx      | 45 +++++++++
 2 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 367f3cc7f..56ac5f2cc 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -277,21 +277,15 @@ interface FolderTreeItemRowProps {
   sortableStyle?: CSSProperties;
 }
 
-// While a thread is dragged over a folder, the folder renders an optimistic
-// preview row for that thread (and is auto-expanded) so it reads as the drop
-// target before the move is committed.
-interface FolderDragPreview {
-  thread: ThreadListEntry;
-  overFolderKey: string;
-}
-
 interface ManualThreadTreeDndState {
   consumeClickSuppression: ConsumeDragClickSuppression;
   dndContextProps: SidebarReorderDndContextProps;
   enabled: boolean;
   itemIdsByParentKey: ReadonlyMap<string, readonly string[]>;
   onClickCapture: MouseEventHandler<HTMLElement>;
-  dragPreview: FolderDragPreview | null;
+  // The folder showing an empty drop-placeholder row while a thread is dragged
+  // over it (after a short hover); the dragged row itself carries the title.
+  dragOverFolderKey: string | null;
 }
 
 interface UseManualThreadTreeDndArgs {
@@ -440,12 +434,14 @@ function useManualThreadTreeDnd({
   );
   const updateThread = useUpdateThread();
   const setCollapsedFolders = useSetAtom(sidebarCollapsedFoldersAtom);
-  const activeThreadRef = useRef<ThreadListEntry | null>(null);
+  // Whether a thread (vs. nothing droppable) is currently being dragged.
+  const draggingThreadRef = useRef(false);
   const dwellTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // The folder the dwell timer is currently counting toward (or showing a
-  // preview for); null when the pointer isn't over a droppable target folder.
+  // The folder the dwell timer is currently counting toward; null when the
+  // pointer isn't over a droppable target folder.
   const dwellFolderKeyRef = useRef<string | null>(null);
-  const [dragPreview, setDragPreview] = useState<FolderDragPreview | null>(
+  // The folder currently showing an (empty) drop-placeholder row, after dwell.
+  const [dragOverFolderKey, setDragOverFolderKey] = useState<string | null>(
     null,
   );
 
@@ -462,42 +458,40 @@ function useManualThreadTreeDnd({
   const handleDragStart = useCallback(
     (event: DragStartEvent) => {
       const activeId = event.active.id;
-      activeThreadRef.current =
-        typeof activeId === "string"
-          ? (lookup.threadByItemId.get(activeId) ?? null)
-          : null;
+      draggingThreadRef.current =
+        typeof activeId === "string" && lookup.threadByItemId.has(activeId);
       clearFolderDwell();
-      setDragPreview(null);
+      setDragOverFolderKey(null);
     },
     [clearFolderDwell, lookup],
   );
 
   const handleDragOver = useCallback(
     (event: DragOverEvent) => {
-      if (!enabled) return;
-      const thread = activeThreadRef.current;
-      if (!thread) return;
+      if (!enabled || !draggingThreadRef.current) return;
       const drop = resolveThreadDropTarget(lookup, event.active, event.over);
-      // Only a real folder (not the loose root) is a preview/expand target.
+      // Only a real folder (not the loose root) is a spring-load target.
       const targetFolderKey =
         drop && drop.toParentKey !== containerId ? drop.toParentKey : null;
 
-      // Same target as the in-flight dwell/preview: nothing to do (don't
-      // thrash timers or layout on every pointer move).
+      // Same target as the in-flight dwell: nothing to do (don't thrash timers
+      // on every pointer move).
       if (targetFolderKey === dwellFolderKeyRef.current) return;
 
-      // Target changed: cancel the pending dwell and drop any shown preview.
       clearFolderDwell();
       dwellFolderKeyRef.current = targetFolderKey;
-      setDragPreview((current) => (current ? null : current));
+      setDragOverFolderKey((current) => (current ? null : current));
       if (targetFolderKey === null) return;
 
-      // Spring-loaded: expand + preview only after the pointer settles, so
-      // passing through a folder mid-drag doesn't shift it under the cursor.
+      // Spring-loaded: expand a collapsed target and show the empty placeholder
+      // only after the pointer settles, so passing through a folder mid-drag
+      // doesn't shift it under the cursor.
       dwellTimerRef.current = setTimeout(() => {
         dwellTimerRef.current = null;
-        const draggingThread = activeThreadRef.current;
-        if (!draggingThread || dwellFolderKeyRef.current !== targetFolderKey) {
+        if (
+          !draggingThreadRef.current ||
+          dwellFolderKeyRef.current !== targetFolderKey
+        ) {
           return;
         }
         setCollapsedFolders((current) =>
@@ -505,10 +499,7 @@ function useManualThreadTreeDnd({
             ? current.filter((key) => key !== targetFolderKey)
             : current,
         );
-        setDragPreview({
-          thread: draggingThread,
-          overFolderKey: targetFolderKey,
-        });
+        setDragOverFolderKey(targetFolderKey);
       }, FOLDER_DRAG_DWELL_MS);
     },
     [clearFolderDwell, containerId, enabled, lookup, setCollapsedFolders],
@@ -516,9 +507,9 @@ function useManualThreadTreeDnd({
 
   const handleDragEnd = useCallback(
     (event: DragEndEvent) => {
-      activeThreadRef.current = null;
+      draggingThreadRef.current = false;
       clearFolderDwell();
-      setDragPreview(null);
+      setDragOverFolderKey(null);
       if (!enabled) return;
 
       const drop = resolveThreadDropTarget(lookup, event.active, event.over);
@@ -539,9 +530,9 @@ function useManualThreadTreeDnd({
   );
 
   const handleDragCancel = useCallback(() => {
-    activeThreadRef.current = null;
+    draggingThreadRef.current = false;
     clearFolderDwell();
-    setDragPreview(null);
+    setDragOverFolderKey(null);
   }, [clearFolderDwell]);
 
   const { consumeClickSuppression, dndContextProps, onClickCapture } =
@@ -562,7 +553,7 @@ function useManualThreadTreeDnd({
     enabled,
     itemIdsByParentKey: lookup.itemIdsByParentKey,
     onClickCapture,
-    dragPreview,
+    dragOverFolderKey,
   };
 }
 
@@ -1460,15 +1451,10 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
 // in sidebarCollapsedFoldersAtom — read here rather than threaded so the rest of
 // the tree's prop wiring and memo equality stay untouched. Children render one
 // depth deeper and, when threads, show their leaf via insideFolder.
-// Non-interactive placeholder for the thread being dragged into a folder,
-// rendered inside the (auto-expanded) folder so it reads as the drop target.
-function FolderDropPreviewRow({
-  depth,
-  title,
-}: {
-  depth: number;
-  title: string;
-}) {
+// Empty drop-slot rendered inside the (auto-expanded) hovered folder so the
+// landing spot is visible. The dragged row itself carries the title (like
+// dragging a queued message), so this placeholder stays intentionally blank.
+export function FolderDropPreviewRow({ depth }: { depth: number }) {
   return (
     <div
       aria-hidden="true"
@@ -1477,11 +1463,9 @@ function FolderDropPreviewRow({
       className={cn(
         SIDEBAR_ROW_BASE_CLASS,
         COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
-        "pointer-events-none border border-dashed border-sidebar-border bg-sidebar-accent/40 text-sidebar-accent-foreground",
+        "pointer-events-none border border-dashed border-sidebar-border bg-sidebar-accent/40",
       )}
-    >
-      <span className="min-w-0 truncate opacity-80">{title}</span>
-    </div>
+    />
   );
 }
 
@@ -1522,13 +1506,11 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   const stickyLevel =
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
   const folderPath = folder.path.join("/");
-  const dragPreview = manualSort?.dragPreview ?? null;
-  const previewThread =
-    dragPreview?.overFolderKey === folderKey ? dragPreview.thread : null;
+  const showDropPreview = manualSort?.dragOverFolderKey === folderKey;
   const showChildren = !isCollapsed && folder.items.length > 0;
   // Force the children area open while a thread is dragged over this folder so
-  // the optimistic drop-preview row is visible even when empty/collapsed.
-  const showChildrenArea = showChildren || previewThread !== null;
+  // the empty drop-placeholder row is visible even when the folder is empty.
+  const showChildrenArea = showChildren || showDropPreview;
 
   return (
     <SidebarStickyGroup
@@ -1592,14 +1574,13 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
               ))}
             </ManualSortableList>
           ) : null}
-          {previewThread ? (
+          {showDropPreview ? (
             <FolderDropPreviewRow
               depth={getThreadRowDepth({
                 depthOffset: depthOffset + 1,
                 nodeDepth: 0,
                 variant,
               })}
-              title={getThreadDisplayTitle(previewThread)}
             />
           ) : null}
         </div>
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
index 5d1d2aeb6..f566d7e14 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
@@ -6,6 +6,7 @@ import {
 } from "@/lib/thread-activity";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import { SidebarFolderRow } from "./SidebarFolderRow";
+import { FolderDropPreviewRow } from "./ProjectRow";
 
 export default {
   title: "sidebar/Folder row",
@@ -107,3 +108,47 @@ export function Overview() {
     </StoryCard>
   );
 }
+
+// Drag-into-folder affordance: the folder highlights as a drop target, and
+// after a short hover it springs open with an empty placeholder slot. The
+// dragged row keeps its own title (like dragging a queued message), so the
+// placeholder stays blank rather than duplicating the title.
+export function DragInto() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="drop target"
+        hint="folder highlights while a thread is dragged over it"
+      >
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Work"
+            pathLabel="Work"
+            depth={0}
+            activity={activity()}
+            isCollapsed={false}
+            onToggleCollapsed={noop}
+            isDropTargetActive
+          />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow
+        label="empty placeholder"
+        hint="after the hover dwell, an empty slot opens inside the folder"
+      >
+        <SidebarStage>
+          <SidebarFolderRow
+            name="Work"
+            pathLabel="Work"
+            depth={0}
+            activity={activity()}
+            isCollapsed={false}
+            onToggleCollapsed={noop}
+            isDropTargetActive
+          />
+          <FolderDropPreviewRow depth={1} />
+        </SidebarStage>
+      </StoryRow>
+    </StoryCard>
+  );
+}

From c67a76af94fc4d01cd1fb1582de56db7cd494214 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 18:09:59 -0700
Subject: [PATCH 47/54] Harden sidebar folder review issues

---
 .../src/components/sidebar/ProjectList.tsx    |  54 +++++++-
 apps/app/src/hooks/queries/query-keys.ts      |   2 +-
 .../src/hooks/queries/thread-queries.test.tsx |  82 ++++++++++++
 apps/app/src/hooks/queries/thread-queries.ts  |  10 +-
 apps/app/src/views/ArchivedThreadsView.tsx    |  14 +-
 apps/server/src/routes/thread-folders.ts      |  29 ++++-
 packages/db/src/data/index.ts                 |   1 +
 packages/db/src/data/thread-folders.ts        |  76 ++++++++++-
 packages/db/test/data/threads.test.ts         | 121 ++++++++++++++++++
 packages/server-contract/src/api/projects.ts  |   2 +
 .../server-contract/test/contract.test.ts     |   2 +
 11 files changed, 373 insertions(+), 20 deletions(-)
 create mode 100644 apps/app/src/hooks/queries/thread-queries.test.tsx

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 04a1aca32..b91180604 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -64,6 +64,10 @@ import {
   ThreadFolderRenameDialog,
   type ThreadFolderRenameDialogTarget,
 } from "@/components/dialogs/ThreadFolderCreateDialog";
+import {
+  ConfirmDeleteDialog,
+  ConfirmDeleteDialogContent,
+} from "@/components/dialogs/ConfirmDeleteDialog";
 import { CHROME_SECTION_LABEL_CLASS } from "@/components/ui/chromeStyleTokens";
 import { Icon, type IconName } from "@/components/ui/icon.js";
 import { Skeleton } from "@/components/ui/skeleton.js";
@@ -1365,7 +1369,10 @@ function ProjectListComponent({
     isPending: isUpdateThreadFolderPending,
     mutate: updateThreadFolderMutate,
   } = useUpdateThreadFolder();
-  const { mutate: deleteThreadFolderMutate } = useDeleteThreadFolder();
+  const {
+    isPending: isDeleteThreadFolderPending,
+    mutate: deleteThreadFolderMutate,
+  } = useDeleteThreadFolder();
   const projectItems = projects ?? EMPTY_PROJECTS;
   const handleReorderProject = useCallback<
     UseNeighborReorderSortableArgs<ProjectResponse>["onReorder"]
@@ -1456,6 +1463,7 @@ function ProjectListComponent({
     projectId: string | null;
   } | null>(null);
   const folderRenameDialog = useDialogState<ThreadFolderRenameDialogTarget>();
+  const folderDeleteDialog = useDialogState<string>();
   const isFolderCreateDialogOpen = folderCreateTarget !== null;
   const handleOpenCreateFolderDialog = useCallback(() => {
     setFolderCreateTarget({ projectId: null });
@@ -1485,7 +1493,7 @@ function ProjectListComponent({
   const handleRenameThreadFolder = useCallback(
     (path: string, newPath: string) => {
       updateThreadFolderMutate(
-        { path, newPath },
+        { path, newPath, projectId: null },
         { onSuccess: () => folderRenameDialog.onClose() },
       );
     },
@@ -1493,9 +1501,28 @@ function ProjectListComponent({
   );
   const handleRemoveThreadFolder = useCallback(
     (path: string) => {
-      deleteThreadFolderMutate({ path });
+      folderDeleteDialog.onOpen(path);
+    },
+    [folderDeleteDialog],
+  );
+  const handleConfirmRemoveThreadFolder = useCallback(() => {
+    const path = folderDeleteDialog.target;
+    if (!path) {
+      return;
+    }
+    deleteThreadFolderMutate(
+      { path, projectId: null },
+      { onSuccess: () => folderDeleteDialog.onClose() },
+    );
+  }, [deleteThreadFolderMutate, folderDeleteDialog]);
+  const handleFolderDeleteDialogOpenChange = useCallback(
+    (open: boolean) => {
+      if (open) {
+        return;
+      }
+      folderDeleteDialog.onClose();
     },
-    [deleteThreadFolderMutate],
+    [folderDeleteDialog],
   );
   const handleOpenProjectlessArchivedThreads = useCallback(() => {
     onProjectSelect?.();
@@ -2046,6 +2073,23 @@ function ProjectListComponent({
       onRename={handleRenameThreadFolder}
     />
   );
+  const folderDeleteDialogContent = (
+    <ConfirmDeleteDialog
+      open={folderDeleteDialog.target !== null}
+      onOpenChange={handleFolderDeleteDialogOpenChange}
+    >
+      {folderDeleteDialog.target ? (
+        <ConfirmDeleteDialogContent
+          title="Remove folder?"
+          description={`Remove "${folderDeleteDialog.target}" and clear it from its threads? This cannot be undone.`}
+          confirmLabel="Remove folder"
+          pending={isDeleteThreadFolderPending}
+          onConfirm={handleConfirmRemoveThreadFolder}
+          onCancel={folderDeleteDialog.onClose}
+        />
+      ) : null}
+    </ConfirmDeleteDialog>
+  );
 
   if (threadSearch?.isActive) {
     return (
@@ -2085,6 +2129,7 @@ function ProjectListComponent({
         </div>
         {folderCreateDialog}
         {folderRenameDialogContent}
+        {folderDeleteDialogContent}
       </ProjectListShell>
     );
   }
@@ -2160,6 +2205,7 @@ function ProjectListComponent({
       </DndContext>
       {folderCreateDialog}
       {folderRenameDialogContent}
+      {folderDeleteDialogContent}
     </ProjectListShell>
   );
 }
diff --git a/apps/app/src/hooks/queries/query-keys.ts b/apps/app/src/hooks/queries/query-keys.ts
index 04a23dffd..1d63dbc4f 100644
--- a/apps/app/src/hooks/queries/query-keys.ts
+++ b/apps/app/src/hooks/queries/query-keys.ts
@@ -79,7 +79,7 @@ export interface ThreadSearchQueryFilters {
 export type ArchivedThreadsKindFilter = "all" | "root" | "child";
 
 export interface ArchivedThreadsListFilters {
-  projectId: string;
+  projectId?: string;
   folderPath?: string;
   unfiled?: boolean;
 }
diff --git a/apps/app/src/hooks/queries/thread-queries.test.tsx b/apps/app/src/hooks/queries/thread-queries.test.tsx
new file mode 100644
index 000000000..ea47bcce1
--- /dev/null
+++ b/apps/app/src/hooks/queries/thread-queries.test.tsx
@@ -0,0 +1,82 @@
+// @vitest-environment jsdom
+
+import { cleanup, renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as api from "@/lib/api";
+import { createQueryClientTestHarness } from "@/test/queryClientTestHarness";
+import { ARCHIVED_THREADS_PAGE_SIZE } from "./archived-threads-page-size";
+import { useArchivedThreads } from "./thread-queries";
+
+vi.mock("@/lib/api", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/api")>();
+  return {
+    ...actual,
+    listThreads: vi.fn(),
+  };
+});
+
+vi.mock("@/hooks/useRealtimeSubscription", () => ({
+  useThreadDetailRealtimeSubscription: vi.fn(),
+  useThreadListRealtimeSubscription: vi.fn(),
+}));
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+beforeEach(() => {
+  vi.mocked(api.listThreads).mockResolvedValue([]);
+});
+
+describe("useArchivedThreads", () => {
+  it("omits projectId for folder-scoped archived lists", async () => {
+    const { wrapper } = createQueryClientTestHarness();
+
+    renderHook(() => useArchivedThreads({ folderPath: "Work" }), { wrapper });
+
+    await waitFor(() => {
+      expect(api.listThreads).toHaveBeenCalled();
+    });
+    expect(vi.mocked(api.listThreads).mock.calls[0]?.[0]).toEqual({
+      archived: true,
+      folderPath: "Work",
+      limit: ARCHIVED_THREADS_PAGE_SIZE,
+      offset: 0,
+    });
+  });
+
+  it("keeps project scope for project archived lists", async () => {
+    const { wrapper } = createQueryClientTestHarness();
+
+    renderHook(() => useArchivedThreads({ projectId: "proj_1" }), {
+      wrapper,
+    });
+
+    await waitFor(() => {
+      expect(api.listThreads).toHaveBeenCalled();
+    });
+    expect(vi.mocked(api.listThreads).mock.calls[0]?.[0]).toEqual({
+      archived: true,
+      limit: ARCHIVED_THREADS_PAGE_SIZE,
+      offset: 0,
+      projectId: "proj_1",
+    });
+  });
+
+  it("omits projectId for global loose archived lists", async () => {
+    const { wrapper } = createQueryClientTestHarness();
+
+    renderHook(() => useArchivedThreads({ unfiled: true }), { wrapper });
+
+    await waitFor(() => {
+      expect(api.listThreads).toHaveBeenCalled();
+    });
+    expect(vi.mocked(api.listThreads).mock.calls[0]?.[0]).toEqual({
+      archived: true,
+      limit: ARCHIVED_THREADS_PAGE_SIZE,
+      offset: 0,
+      unfiled: true,
+    });
+  });
+});
diff --git a/apps/app/src/hooks/queries/thread-queries.ts b/apps/app/src/hooks/queries/thread-queries.ts
index 0806aa1b0..80f747f16 100644
--- a/apps/app/src/hooks/queries/thread-queries.ts
+++ b/apps/app/src/hooks/queries/thread-queries.ts
@@ -268,7 +268,7 @@ export function hasThreadSearchableQuery(value: string): boolean {
 }
 
 export interface UseArchivedThreadsFilters {
-  projectId: string | undefined;
+  projectId?: string;
   /** Restrict to threads filed directly under this folder path. */
   folderPath?: string;
   /** Restrict to loose threads — those not filed under any folder. */
@@ -280,7 +280,9 @@ export function useArchivedThreads(
   options?: QueryOptions,
 ) {
   const { projectId, folderPath, unfiled } = filters;
-  const enabled = (options?.enabled ?? true) && Boolean(projectId);
+  const enabled =
+    (options?.enabled ?? true) &&
+    (Boolean(projectId) || Boolean(folderPath) || Boolean(unfiled));
   useThreadListRealtimeSubscription({ enabled });
 
   return useInfiniteQuery<
@@ -291,14 +293,14 @@ export function useArchivedThreads(
     number
   >({
     queryKey: archivedThreadsListQueryKey({
-      projectId: projectId ?? "",
+      ...(projectId ? { projectId } : {}),
       ...(folderPath ? { folderPath } : {}),
       ...(unfiled ? { unfiled: true } : {}),
     }),
     queryFn: ({ pageParam, signal }) =>
       api.listThreads(
         {
-          projectId: requireThreadId(projectId ?? "", "useArchivedThreads"),
+          ...(projectId ? { projectId } : {}),
           ...(folderPath ? { folderPath } : {}),
           ...(unfiled ? { unfiled: true } : {}),
           archived: true,
diff --git a/apps/app/src/views/ArchivedThreadsView.tsx b/apps/app/src/views/ArchivedThreadsView.tsx
index 27d3501b5..04e4079cd 100644
--- a/apps/app/src/views/ArchivedThreadsView.tsx
+++ b/apps/app/src/views/ArchivedThreadsView.tsx
@@ -1,5 +1,6 @@
 import { useMemo } from "react";
 import { Link, useSearchParams } from "react-router-dom";
+import { useAtomValue } from "jotai";
 import { PERSONAL_PROJECT_ID, type ThreadListEntry } from "@bb/domain";
 import { Button } from "@/components/ui/button.js";
 import { EmptyStatePanel } from "@/components/ui/empty-state.js";
@@ -11,6 +12,7 @@ import { useArchivedThreads } from "@/hooks/queries/thread-queries";
 import { useRouteState } from "@/hooks/useRouteState";
 import { getThreadDisplayTitle } from "@/lib/thread-title";
 import { getThreadRoutePath } from "@/lib/route-paths";
+import { sidebarOrganizationModeAtom } from "@/components/sidebar/sidebarCollapsedAtoms";
 
 type ArchivedThreadPillLabel = "child";
 
@@ -30,12 +32,18 @@ function getArchivedThreadPillLabel(
 export function ArchivedThreadsView() {
   const { projectId } = useRouteState();
   const [searchParams] = useSearchParams();
+  const sidebarOrganizationMode = useAtomValue(sidebarOrganizationModeAtom);
   const folderPath = searchParams.get("folder") ?? undefined;
-  // The personal section's archived list shows loose threads only; threads
-  // filed in a folder live in that folder's archived list instead.
+  const isGlobalFoldersMode =
+    projectId === PERSONAL_PROJECT_ID &&
+    sidebarOrganizationMode === "chronological";
+  const archivedProjectId =
+    folderPath || isGlobalFoldersMode ? undefined : projectId;
+  // The loose archived list mirrors the current sidebar scope: in project mode
+  // it is personal-only; in Folders mode it is cross-project loose threads.
   const restrictToLoose = !folderPath && projectId === PERSONAL_PROJECT_ID;
   const archivedThreadsQuery = useArchivedThreads({
-    projectId,
+    projectId: archivedProjectId,
     ...(folderPath ? { folderPath } : {}),
     ...(restrictToLoose ? { unfiled: true } : {}),
   });
diff --git a/apps/server/src/routes/thread-folders.ts b/apps/server/src/routes/thread-folders.ts
index ed01cf9f9..983df66a5 100644
--- a/apps/server/src/routes/thread-folders.ts
+++ b/apps/server/src/routes/thread-folders.ts
@@ -1,6 +1,7 @@
 import {
   createThreadFolder,
   deleteThreadFolder,
+  isThreadFolderDescendantPath,
   normalizeThreadFolderPath,
   renameThreadFolder,
 } from "@bb/db";
@@ -14,6 +15,15 @@ import type { AppDeps } from "../types.js";
 import { ApiError } from "../errors.js";
 import { requirePublicProject } from "../services/lib/entity-lookup.js";
 
+function requireThreadFolderProjectScope(
+  db: AppDeps["db"],
+  projectId: string | null | undefined,
+): void {
+  if (projectId !== undefined && projectId !== null) {
+    requirePublicProject(db, projectId);
+  }
+}
+
 export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
   const { del, patch, post } = typedRoutes<PublicApiSchema>(app, {
     onValidationError: (msg) => new ApiError(400, "invalid_request", msg),
@@ -44,7 +54,20 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path || !newPath) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
-    const result = renameThreadFolder(deps.db, deps.hub, { path, newPath });
+    const projectId = payload.projectId;
+    requireThreadFolderProjectScope(deps.db, projectId);
+    if (isThreadFolderDescendantPath(path, newPath)) {
+      throw new ApiError(
+        400,
+        "invalid_request",
+        "Folder cannot be moved into one of its subfolders",
+      );
+    }
+    const result = renameThreadFolder(deps.db, deps.hub, {
+      path,
+      newPath,
+      projectId,
+    });
     if (!result) {
       throw new ApiError(404, "folder_not_found", "Folder not found");
     }
@@ -56,7 +79,9 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
-    const result = deleteThreadFolder(deps.db, deps.hub, { path });
+    const projectId = payload.projectId;
+    requireThreadFolderProjectScope(deps.db, projectId);
+    const result = deleteThreadFolder(deps.db, deps.hub, { path, projectId });
     if (!result) {
       throw new ApiError(404, "folder_not_found", "Folder not found");
     }
diff --git a/packages/db/src/data/index.ts b/packages/db/src/data/index.ts
index 258822057..920119a2c 100644
--- a/packages/db/src/data/index.ts
+++ b/packages/db/src/data/index.ts
@@ -24,6 +24,7 @@ export {
   deleteThreadFolder,
   ensureThreadFolderPath,
   getThreadFolderByPath,
+  isThreadFolderDescendantPath,
   listThreadFolders,
   normalizeThreadFolderPath,
   renameThreadFolder,
diff --git a/packages/db/src/data/thread-folders.ts b/packages/db/src/data/thread-folders.ts
index 4c146afbf..fc2e932a0 100644
--- a/packages/db/src/data/thread-folders.ts
+++ b/packages/db/src/data/thread-folders.ts
@@ -21,10 +21,12 @@ export interface CreateThreadFolderInput {
 export interface RenameThreadFolderInput {
   path: string;
   newPath: string;
+  projectId?: string | null;
 }
 
 export interface DeleteThreadFolderInput {
   path: string;
+  projectId?: string | null;
 }
 
 export interface ThreadFolderMutationResult {
@@ -65,6 +67,22 @@ function folderPathSubtreeFilter(
   );
 }
 
+function folderProjectScopeFilter(projectId: string | null | undefined) {
+  if (projectId === undefined) {
+    return undefined;
+  }
+  return projectId === null
+    ? isNull(threadFolders.projectId)
+    : eq(threadFolders.projectId, projectId);
+}
+
+function threadProjectScopeFilter(projectId: string | null | undefined) {
+  if (projectId === undefined) {
+    return undefined;
+  }
+  return projectId === null ? sql`1 = 0` : eq(threads.projectId, projectId);
+}
+
 function replaceFolderPathPrefix(
   value: string,
   oldPath: string,
@@ -87,6 +105,19 @@ function notifyThreadFolderMutationProjects(
   }
 }
 
+export function isThreadFolderDescendantPath(
+  path: string | null | undefined,
+  possibleDescendantPath: string | null | undefined,
+): boolean {
+  const normalizedPath = normalizeThreadFolderPath(path);
+  const normalizedDescendant = normalizeThreadFolderPath(possibleDescendantPath);
+  return Boolean(
+    normalizedPath &&
+      normalizedDescendant &&
+      normalizedDescendant.startsWith(`${normalizedPath}/`),
+  );
+}
+
 export function getThreadFolderByPath(
   db: DbQueryConnection,
   path: string,
@@ -196,13 +227,21 @@ export function renameThreadFolder(
   if (path === newPath) {
     return { path: newPath, updatedThreadCount: 0 };
   }
+  if (isThreadFolderDescendantPath(path, newPath)) {
+    return null;
+  }
 
   return db.transaction(
     (tx) => {
       const matchingFolders = tx
         .select()
         .from(threadFolders)
-        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threadFolders.path, path),
+            folderProjectScopeFilter(input.projectId),
+          ),
+        )
         .all();
       const matchingThreads = tx
         .select({
@@ -211,7 +250,12 @@ export function renameThreadFolder(
           folderPath: threads.folderPath,
         })
         .from(threads)
-        .where(folderPathSubtreeFilter(threads.folderPath, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threads.folderPath, path),
+            threadProjectScopeFilter(input.projectId),
+          ),
+        )
         .all();
 
       if (matchingFolders.length === 0 && matchingThreads.length === 0) {
@@ -219,7 +263,12 @@ export function renameThreadFolder(
       }
 
       tx.delete(threadFolders)
-        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threadFolders.path, path),
+            folderProjectScopeFilter(input.projectId),
+          ),
+        )
         .run();
 
       const affectedProjects = new Set<string | null>();
@@ -276,7 +325,12 @@ export function deleteThreadFolder(
       const matchingFolders = tx
         .select()
         .from(threadFolders)
-        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threadFolders.path, path),
+            folderProjectScopeFilter(input.projectId),
+          ),
+        )
         .all();
       const matchingThreads = tx
         .select({
@@ -284,7 +338,12 @@ export function deleteThreadFolder(
           projectId: threads.projectId,
         })
         .from(threads)
-        .where(folderPathSubtreeFilter(threads.folderPath, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threads.folderPath, path),
+            threadProjectScopeFilter(input.projectId),
+          ),
+        )
         .all();
 
       if (matchingFolders.length === 0 && matchingThreads.length === 0) {
@@ -292,7 +351,12 @@ export function deleteThreadFolder(
       }
 
       tx.delete(threadFolders)
-        .where(folderPathSubtreeFilter(threadFolders.path, path))
+        .where(
+          and(
+            folderPathSubtreeFilter(threadFolders.path, path),
+            folderProjectScopeFilter(input.projectId),
+          ),
+        )
         .run();
 
       const now = Date.now();
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index 3bf8381f6..dca8cd6ae 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -829,6 +829,88 @@ describe("threads", () => {
     );
   });
 
+  it("renames only one project folder scope when projectId is supplied", () => {
+    const { db, host, project } = setup();
+    const { project: otherProject } = createProject(db, noopNotifier, {
+      name: "other-project",
+      source: { type: "local_path", hostId: host.id, path: "/tmp/other" },
+    });
+    const projectThread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    const otherProjectThread = createThread(db, noopNotifier, {
+      projectId: otherProject.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    createThreadFolder(db, noopNotifier, { path: "Work/Global" });
+
+    const result = renameThreadFolder(db, noopNotifier, {
+      path: "Work",
+      newPath: "Archive",
+      projectId: project.id,
+    });
+
+    expect(result).toEqual({ path: "Archive", updatedThreadCount: 1 });
+    expect(getThread(db, projectThread.id)?.folderPath).toBe("Archive/Q3");
+    expect(getThread(db, otherProjectThread.id)?.folderPath).toBe("Work/Q3");
+    expect(
+      listThreadFolders(db)
+        .map((folder) => ({
+          path: folder.path,
+          projectId: folder.projectId,
+        }))
+        .sort((left, right) =>
+          `${left.projectId ?? ""}:${left.path}`.localeCompare(
+            `${right.projectId ?? ""}:${right.path}`,
+          ),
+        ),
+    ).toEqual(
+      [
+        { path: "Work", projectId: null },
+        { path: "Work/Global", projectId: null },
+        { path: "Archive", projectId: project.id },
+        { path: "Archive/Q3", projectId: project.id },
+        { path: "Work", projectId: otherProject.id },
+        { path: "Work/Q3", projectId: otherProject.id },
+      ].sort((left, right) =>
+        `${left.projectId ?? ""}:${left.path}`.localeCompare(
+          `${right.projectId ?? ""}:${right.path}`,
+        ),
+      ),
+    );
+  });
+
+  it("does not rename a thread folder into its own descendant", () => {
+    const { db, project } = setup();
+    const thread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    createThreadFolder(db, noopNotifier, { path: "Work/Empty" });
+    const foldersBefore = listThreadFolders(db).map((folder) => ({
+      path: folder.path,
+      projectId: folder.projectId,
+    }));
+
+    const result = renameThreadFolder(db, noopNotifier, {
+      path: "Work",
+      newPath: "Work/Q3",
+    });
+
+    expect(result).toBeNull();
+    expect(getThread(db, thread.id)?.folderPath).toBe("Work/Q3");
+    expect(
+      listThreadFolders(db).map((folder) => ({
+        path: folder.path,
+        projectId: folder.projectId,
+      })),
+    ).toEqual(foldersBefore);
+  });
+
   it("removes thread folders and clears descendant thread folder paths", () => {
     const { db, project } = setup();
     const thread = createThread(db, noopNotifier, {
@@ -845,6 +927,45 @@ describe("threads", () => {
     expect(listThreadFolders(db)).toEqual([]);
   });
 
+  it("removes only one project folder scope when projectId is supplied", () => {
+    const { db, host, project } = setup();
+    const { project: otherProject } = createProject(db, noopNotifier, {
+      name: "other-project",
+      source: { type: "local_path", hostId: host.id, path: "/tmp/other" },
+    });
+    const projectThread = createThread(db, noopNotifier, {
+      projectId: project.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    const otherProjectThread = createThread(db, noopNotifier, {
+      projectId: otherProject.id,
+      providerId: "codex",
+      folderPath: "Work/Q3",
+    });
+    createThreadFolder(db, noopNotifier, { path: "Work/Global" });
+
+    const result = deleteThreadFolder(db, noopNotifier, {
+      path: "Work",
+      projectId: project.id,
+    });
+
+    expect(result).toEqual({ path: "Work", updatedThreadCount: 1 });
+    expect(getThread(db, projectThread.id)?.folderPath).toBeNull();
+    expect(getThread(db, otherProjectThread.id)?.folderPath).toBe("Work/Q3");
+    expect(
+      listThreadFolders(db).map((folder) => ({
+        path: folder.path,
+        projectId: folder.projectId,
+      })),
+    ).toEqual([
+      { path: "Work", projectId: null },
+      { path: "Work/Global", projectId: null },
+      { path: "Work", projectId: otherProject.id },
+      { path: "Work/Q3", projectId: otherProject.id },
+    ]);
+  });
+
   it("notifies when a thread parent changes", () => {
     const { db, project } = setup();
     const spy: DbNotifier = {
diff --git a/packages/server-contract/src/api/projects.ts b/packages/server-contract/src/api/projects.ts
index 876423370..668a66ba1 100644
--- a/packages/server-contract/src/api/projects.ts
+++ b/packages/server-contract/src/api/projects.ts
@@ -79,6 +79,7 @@ export const updateThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
     newPath: z.string().min(1),
+    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type UpdateThreadFolderRequest = z.infer<
@@ -88,6 +89,7 @@ export type UpdateThreadFolderRequest = z.infer<
 export const deleteThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
+    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type DeleteThreadFolderRequest = z.infer<
diff --git a/packages/server-contract/test/contract.test.ts b/packages/server-contract/test/contract.test.ts
index a193bf5b6..35fb825f1 100644
--- a/packages/server-contract/test/contract.test.ts
+++ b/packages/server-contract/test/contract.test.ts
@@ -184,6 +184,7 @@ const OPTIONAL_SERVER_FIELD_GROUPS: readonly OptionalServerFieldGroup[] = [
     fields: [
       "threadListQuerySchema.archived",
       "threadListQuerySchema.childOrigin",
+      "threadListQuerySchema.folderPath",
       "threadListQuerySchema.limit",
       "threadListQuerySchema.hasParent",
       "threadListQuerySchema.offset",
@@ -191,6 +192,7 @@ const OPTIONAL_SERVER_FIELD_GROUPS: readonly OptionalServerFieldGroup[] = [
       "threadListQuerySchema.parentThreadId",
       "threadListQuerySchema.projectId",
       "threadListQuerySchema.sourceThreadId",
+      "threadListQuerySchema.unfiled",
     ],
   },
   {

From c6015d31fddee20485c78133b089f2a61d1403e4 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 18:13:25 -0700
Subject: [PATCH 48/54] Add folderPath to CLI thread test fixture after main
 merge

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/cli/src/__tests__/helpers/command-output-fixtures.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/cli/src/__tests__/helpers/command-output-fixtures.ts b/apps/cli/src/__tests__/helpers/command-output-fixtures.ts
index 041f5ff07..fbed5e550 100644
--- a/apps/cli/src/__tests__/helpers/command-output-fixtures.ts
+++ b/apps/cli/src/__tests__/helpers/command-output-fixtures.ts
@@ -106,6 +106,7 @@ export function makeThread(overrides: MakeThreadArgs): Thread {
     status: "idle",
     title: null,
     titleFallback: null,
+    folderPath: null,
     environmentId: null,
     parentThreadId: null,
     sourceThreadId: null,

From e94094ccaab0d0b8651c1438a396f95b38fc7387 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 19 Jun 2026 18:25:39 -0700
Subject: [PATCH 49/54] Drop folder schema in migrate-test replay rollbacks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The thread-folder migrations (0042 folder_path, 0043 thread_folders, 0044
project scoping) land after thread-search, so migrate-test scenarios that rewind
the ledger past them must drop the folder schema too — otherwise migrate()
re-runs ADD folder_path / CREATE thread_folders against a DB that still has them
(duplicate column / table already exists). Add dropThreadFolderSchema to the
reset/rollback paths (thread-search replay, post-0023, event-large-value, and
the fork/side-chat rewind).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 packages/db/test/migrate.test.ts | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/db/test/migrate.test.ts b/packages/db/test/migrate.test.ts
index 89046ed22..97b2fd162 100644
--- a/packages/db/test/migrate.test.ts
+++ b/packages/db/test/migrate.test.ts
@@ -195,7 +195,10 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const latestMigrationWhen = Math.max(
   ...(
     JSON.parse(
-      readFileSync(resolve(__dirname, "../drizzle/meta/_journal.json"), "utf-8"),
+      readFileSync(
+        resolve(__dirname, "../drizzle/meta/_journal.json"),
+        "utf-8",
+      ),
     ) as { entries: { when: number }[] }
   ).entries.map((entry) => entry.when),
 );
@@ -291,6 +294,7 @@ function closeConnection(db: DbConnection): void {
 // NOTE: when adding a migration after thread-search, drop its schema here too.
 function resetMigrationsAfterThreadSearch(db: DbConnection): void {
   dropAutomationsSchema(db);
+  dropThreadFolderSchema(db);
   db.$client
     .prepare<[number]>("DELETE FROM __drizzle_migrations WHERE created_at > ?")
     .run(threadSearchRowidFtsMigrationWhen);
@@ -379,6 +383,25 @@ function dropPost0023Tables(db: DbConnection): void {
   ]) {
     db.$client.prepare(`DROP TABLE IF EXISTS ${table}`).run();
   }
+
+  dropThreadFolderSchema(db);
+}
+
+/**
+ * Folder schema lands after thread-search (0042 folder_path column, 0043
+ * thread_folders table, 0044 project scoping). Replay scenarios that rewind the
+ * ledger past it must drop the schema too, or migrate() re-runs the ADD/CREATE
+ * against a DB that already has them.
+ */
+function dropThreadFolderSchema(db: DbConnection): void {
+  db.$client.exec("DROP TABLE IF EXISTS thread_folders;");
+  const hasFolderPath = db.$client
+    .prepare<[], TableInfoRow>("PRAGMA table_info(threads)")
+    .all()
+    .some((row) => row.name === "folder_path");
+  if (hasFolderPath) {
+    db.$client.prepare("ALTER TABLE threads DROP COLUMN folder_path").run();
+  }
 }
 
 function restorePre0022ThreadTypeSchema(db: DbConnection): void {
@@ -489,6 +512,7 @@ function markEventLargeValuesMigrationUnapplied(db: DbConnection): void {
   restoreEnvironmentCleanupModeColumn(db);
   restoreEnvironmentCleanupRequestedAtColumn(db);
   restoreThreadStopRequestedAtColumn(db);
+  dropThreadFolderSchema(db);
   db.$client
     .prepare<DeleteMigrationParameters>(
       `
@@ -716,7 +740,9 @@ function expectEventLargeValuesInline(
   expect(webSearchData.item.resultText).toBe(values.webSearchResult);
   expect(webSearchData.item.truncation).toBeUndefined();
 
-  const fileData = JSON.parse(readMigratedEventData(db, "evt_large_file_diffs"));
+  const fileData = JSON.parse(
+    readMigratedEventData(db, "evt_large_file_diffs"),
+  );
   expect(fileData.item.changes).toEqual([
     { path: "a.ts", diff: values.firstDiff },
     { path: "b.ts", diff: "small diff" },
@@ -1388,6 +1414,7 @@ describe("migrate", () => {
         )
         .run(threadSourceOriginMigrationWhen);
       dropAutomationsSchema(db);
+      dropThreadFolderSchema(db);
       db.$client.exec(`
         DROP TRIGGER IF EXISTS thread_search_segments_after_text_update;
         DROP TRIGGER IF EXISTS thread_search_segments_after_delete;

From 848f110bfc96a0d8156a5de5d1c54100b539f0c9 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Sat, 20 Jun 2026 01:34:02 -0700
Subject: [PATCH 50/54] Make thread folders a global cross-project namespace

Folders are organized by path and a single folder is meant to hold threads
from any project, but the prior implementation added a project_id scope to
thread_folders plus a projectId field on the create/rename/delete contract.
In practice the UI only ever sent projectId: null, and the global (null) path
matched zero threads (threadProjectScopeFilter returned 1 = 0), so renaming or
deleting a folder in the app orphaned every thread inside it. Filing a thread
into a folder also created a project-scoped folder row, diverging from the
global rows the create dialog made.

Remove project scoping entirely:
- Drop thread_folders.project_id (fold into migration 0043; delete the
  project-scoping migration 0044 + its snapshot/journal entry, no new
  migration needed since folders never shipped).
- Match a folder's threads by path across all projects on rename/delete.
- Strip projectId from the contract request/response schemas, the server
  route, the data layer, and the sidebar create/rename/delete calls.
- Replace the project-scope unit tests with cross-project coverage.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/components/sidebar/ProjectList.tsx    |   20 +-
 apps/server/src/routes/thread-folders.ts      |   29 +-
 packages/db/drizzle/0044_solid_mysterio.sql   |    5 -
 packages/db/drizzle/meta/0044_snapshot.json   | 2823 -----------------
 packages/db/drizzle/meta/_journal.json        |    7 -
 packages/db/src/data/thread-folders.ts        |  107 +-
 packages/db/src/data/threads.ts               |    9 +-
 packages/db/src/schema.ts                     |   11 +-
 packages/db/test/data/threads.test.ts         |  152 +-
 packages/db/test/migrate.test.ts              |    6 +-
 packages/server-contract/src/api/projects.ts  |    4 -
 11 files changed, 62 insertions(+), 3111 deletions(-)
 delete mode 100644 packages/db/drizzle/0044_solid_mysterio.sql
 delete mode 100644 packages/db/drizzle/meta/0044_snapshot.json

diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index b91180604..54ab2bbff 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -1459,30 +1459,28 @@ function ProjectListComponent({
     },
     [navigate, onProjectSelect],
   );
-  const [folderCreateTarget, setFolderCreateTarget] = useState<{
-    projectId: string | null;
-  } | null>(null);
+  const [isFolderCreateDialogOpen, setIsFolderCreateDialogOpen] =
+    useState(false);
   const folderRenameDialog = useDialogState<ThreadFolderRenameDialogTarget>();
   const folderDeleteDialog = useDialogState<string>();
-  const isFolderCreateDialogOpen = folderCreateTarget !== null;
   const handleOpenCreateFolderDialog = useCallback(() => {
-    setFolderCreateTarget({ projectId: null });
+    setIsFolderCreateDialogOpen(true);
   }, []);
   const handleCreateFolderDialogOpenChange = useCallback((open: boolean) => {
     if (!open) {
-      setFolderCreateTarget(null);
+      setIsFolderCreateDialogOpen(false);
     }
   }, []);
   const handleCreateThreadFolder = useCallback(
     (path: string) => {
       createThreadFolderMutate(
-        { path, projectId: folderCreateTarget?.projectId ?? null },
+        { path },
         {
-          onSuccess: () => setFolderCreateTarget(null),
+          onSuccess: () => setIsFolderCreateDialogOpen(false),
         },
       );
     },
-    [createThreadFolderMutate, folderCreateTarget],
+    [createThreadFolderMutate],
   );
   const handleOpenRenameThreadFolder = useCallback(
     (path: string) => {
@@ -1493,7 +1491,7 @@ function ProjectListComponent({
   const handleRenameThreadFolder = useCallback(
     (path: string, newPath: string) => {
       updateThreadFolderMutate(
-        { path, newPath, projectId: null },
+        { path, newPath },
         { onSuccess: () => folderRenameDialog.onClose() },
       );
     },
@@ -1511,7 +1509,7 @@ function ProjectListComponent({
       return;
     }
     deleteThreadFolderMutate(
-      { path, projectId: null },
+      { path },
       { onSuccess: () => folderDeleteDialog.onClose() },
     );
   }, [deleteThreadFolderMutate, folderDeleteDialog]);
diff --git a/apps/server/src/routes/thread-folders.ts b/apps/server/src/routes/thread-folders.ts
index 983df66a5..e13a43f2d 100644
--- a/apps/server/src/routes/thread-folders.ts
+++ b/apps/server/src/routes/thread-folders.ts
@@ -13,16 +13,6 @@ import {
 import type { Hono } from "hono";
 import type { AppDeps } from "../types.js";
 import { ApiError } from "../errors.js";
-import { requirePublicProject } from "../services/lib/entity-lookup.js";
-
-function requireThreadFolderProjectScope(
-  db: AppDeps["db"],
-  projectId: string | null | undefined,
-): void {
-  if (projectId !== undefined && projectId !== null) {
-    requirePublicProject(db, projectId);
-  }
-}
 
 export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
   const { del, patch, post } = typedRoutes<PublicApiSchema>(app, {
@@ -35,17 +25,7 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
-    const projectId = payload.projectId ?? null;
-    if (projectId !== null) {
-      requirePublicProject(deps.db, projectId);
-    }
-    return context.json(
-      createThreadFolder(deps.db, deps.hub, {
-        path,
-        projectId,
-      }),
-      201,
-    );
+    return context.json(createThreadFolder(deps.db, deps.hub, { path }), 201);
   });
 
   patch(routes.update, (context, payload) => {
@@ -54,8 +34,6 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path || !newPath) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
-    const projectId = payload.projectId;
-    requireThreadFolderProjectScope(deps.db, projectId);
     if (isThreadFolderDescendantPath(path, newPath)) {
       throw new ApiError(
         400,
@@ -66,7 +44,6 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     const result = renameThreadFolder(deps.db, deps.hub, {
       path,
       newPath,
-      projectId,
     });
     if (!result) {
       throw new ApiError(404, "folder_not_found", "Folder not found");
@@ -79,9 +56,7 @@ export function registerThreadFolderRoutes(app: Hono, deps: AppDeps): void {
     if (!path) {
       throw new ApiError(400, "invalid_request", "Folder name cannot be empty");
     }
-    const projectId = payload.projectId;
-    requireThreadFolderProjectScope(deps.db, projectId);
-    const result = deleteThreadFolder(deps.db, deps.hub, { path, projectId });
+    const result = deleteThreadFolder(deps.db, deps.hub, { path });
     if (!result) {
       throw new ApiError(404, "folder_not_found", "Folder not found");
     }
diff --git a/packages/db/drizzle/0044_solid_mysterio.sql b/packages/db/drizzle/0044_solid_mysterio.sql
deleted file mode 100644
index 29b8342b8..000000000
--- a/packages/db/drizzle/0044_solid_mysterio.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP INDEX `thread_folders_path_idx`;--> statement-breakpoint
-ALTER TABLE `thread_folders` ADD `project_id` text REFERENCES projects(id) ON DELETE cascade;--> statement-breakpoint
-CREATE UNIQUE INDEX `thread_folders_global_path_idx` ON `thread_folders` (`path`) WHERE "thread_folders"."project_id" IS NULL;--> statement-breakpoint
-CREATE UNIQUE INDEX `thread_folders_project_path_idx` ON `thread_folders` (`project_id`,`path`) WHERE "thread_folders"."project_id" IS NOT NULL;--> statement-breakpoint
-CREATE INDEX `thread_folders_project_idx` ON `thread_folders` (`project_id`);
diff --git a/packages/db/drizzle/meta/0044_snapshot.json b/packages/db/drizzle/meta/0044_snapshot.json
deleted file mode 100644
index 7378e9bb6..000000000
--- a/packages/db/drizzle/meta/0044_snapshot.json
+++ /dev/null
@@ -1,2823 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "16d6dffb-2400-4fb6-b6c7-a17c9e224a9a",
-  "prevId": "e455b374-86f9-4bcf-93dc-d77a46b9fec0",
-  "tables": {
-    "apikey": {
-      "name": "apikey",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "start": {
-          "name": "start",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "prefix": {
-          "name": "prefix",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "referenceId": {
-          "name": "referenceId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refillInterval": {
-          "name": "refillInterval",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "refillAmount": {
-          "name": "refillAmount",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastRefillAt": {
-          "name": "lastRefillAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rateLimitEnabled": {
-          "name": "rateLimitEnabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rateLimitTimeWindow": {
-          "name": "rateLimitTimeWindow",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rateLimitMax": {
-          "name": "rateLimitMax",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "requestCount": {
-          "name": "requestCount",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "remaining": {
-          "name": "remaining",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastRequest": {
-          "name": "lastRequest",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "permissions": {
-          "name": "permissions",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "configId": {
-          "name": "configId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "apikey_key_unique": {
-          "name": "apikey_key_unique",
-          "columns": [
-            "key"
-          ],
-          "isUnique": true
-        },
-        "apikey_reference_id_idx": {
-          "name": "apikey_reference_id_idx",
-          "columns": [
-            "referenceId"
-          ],
-          "isUnique": false
-        },
-        "apikey_config_id_idx": {
-          "name": "apikey_config_id_idx",
-          "columns": [
-            "configId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "apikey_referenceId_user_id_fk": {
-          "name": "apikey_referenceId_user_id_fk",
-          "tableFrom": "apikey",
-          "tableTo": "user",
-          "columnsFrom": [
-            "referenceId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user": {
-      "name": "user",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "emailVerified": {
-          "name": "emailVerified",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "automation_runs": {
-      "name": "automation_runs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "automation_id": {
-          "name": "automation_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "run_mode": {
-          "name": "run_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "trigger": {
-          "name": "trigger",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "skip_reason": {
-          "name": "skip_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "error": {
-          "name": "error",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "output": {
-          "name": "output",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "exit_code": {
-          "name": "exit_code",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "idempotency_key": {
-          "name": "idempotency_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "scheduled_for": {
-          "name": "scheduled_for",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "started_at": {
-          "name": "started_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "finished_at": {
-          "name": "finished_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "automation_runs_automation_started_idx": {
-          "name": "automation_runs_automation_started_idx",
-          "columns": [
-            "automation_id",
-            "started_at"
-          ],
-          "isUnique": false
-        },
-        "automation_runs_thread_idx": {
-          "name": "automation_runs_thread_idx",
-          "columns": [
-            "thread_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "automation_runs_automation_id_automations_id_fk": {
-          "name": "automation_runs_automation_id_automations_id_fk",
-          "tableFrom": "automation_runs",
-          "tableTo": "automations",
-          "columnsFrom": [
-            "automation_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "automation_runs_thread_id_threads_id_fk": {
-          "name": "automation_runs_thread_id_threads_id_fk",
-          "tableFrom": "automation_runs",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "automations": {
-      "name": "automations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "target_thread_id": {
-          "name": "target_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "trigger_type": {
-          "name": "trigger_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "trigger_config": {
-          "name": "trigger_config",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "run_mode": {
-          "name": "run_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "execution": {
-          "name": "execution",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "environment": {
-          "name": "environment",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "auto_archive": {
-          "name": "auto_archive",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "origin": {
-          "name": "origin",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_by_thread_id": {
-          "name": "created_by_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "next_run_at": {
-          "name": "next_run_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_run_at": {
-          "name": "last_run_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "run_count": {
-          "name": "run_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_run_status": {
-          "name": "last_run_status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_run_thread_id": {
-          "name": "last_run_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_error": {
-          "name": "last_error",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "automations_project_idx": {
-          "name": "automations_project_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "automations_due_idx": {
-          "name": "automations_due_idx",
-          "columns": [
-            "enabled",
-            "trigger_type",
-            "next_run_at"
-          ],
-          "isUnique": false
-        },
-        "automations_target_thread_idx": {
-          "name": "automations_target_thread_idx",
-          "columns": [
-            "target_thread_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "automations_project_id_projects_id_fk": {
-          "name": "automations_project_id_projects_id_fk",
-          "tableFrom": "automations",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "automations_target_thread_id_threads_id_fk": {
-          "name": "automations_target_thread_id_threads_id_fk",
-          "tableFrom": "automations",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "target_thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "environments": {
-      "name": "environments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_id": {
-          "name": "host_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "managed": {
-          "name": "managed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "is_git_repo": {
-          "name": "is_git_repo",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "is_worktree": {
-          "name": "is_worktree",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "branch_name": {
-          "name": "branch_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "base_branch": {
-          "name": "base_branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "default_branch": {
-          "name": "default_branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "merge_base_branch": {
-          "name": "merge_base_branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "destroy_attempt_id": {
-          "name": "destroy_attempt_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "workspace_provision_type": {
-          "name": "workspace_provision_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'provisioning'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "environments_host_path_idx": {
-          "name": "environments_host_path_idx",
-          "columns": [
-            "host_id",
-            "path"
-          ],
-          "isUnique": true
-        },
-        "environments_project_idx": {
-          "name": "environments_project_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "environments_status_idx": {
-          "name": "environments_status_idx",
-          "columns": [
-            "status"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "environments_project_id_projects_id_fk": {
-          "name": "environments_project_id_projects_id_fk",
-          "tableFrom": "environments",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "environments_host_id_hosts_id_fk": {
-          "name": "environments_host_id_hosts_id_fk",
-          "tableFrom": "environments",
-          "tableTo": "hosts",
-          "columnsFrom": [
-            "host_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "events": {
-      "name": "events",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "environment_id": {
-          "name": "environment_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "scope_kind": {
-          "name": "scope_kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "turn_id": {
-          "name": "turn_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "provider_thread_id": {
-          "name": "provider_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sequence": {
-          "name": "sequence",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_kind": {
-          "name": "item_kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "data": {
-          "name": "data",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'{}'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "events_thread_sequence_idx": {
-          "name": "events_thread_sequence_idx",
-          "columns": [
-            "thread_id",
-            "sequence"
-          ],
-          "isUnique": true
-        },
-        "events_thread_type_item_kind_sequence_idx": {
-          "name": "events_thread_type_item_kind_sequence_idx",
-          "columns": [
-            "thread_id",
-            "type",
-            "item_kind",
-            "sequence"
-          ],
-          "isUnique": false
-        },
-        "events_thread_type_sequence_idx": {
-          "name": "events_thread_type_sequence_idx",
-          "columns": [
-            "thread_id",
-            "type",
-            "sequence"
-          ],
-          "isUnique": false
-        },
-        "events_thread_turn_type_item_sequence_idx": {
-          "name": "events_thread_turn_type_item_sequence_idx",
-          "columns": [
-            "thread_id",
-            "turn_id",
-            "type",
-            "item_id",
-            "sequence"
-          ],
-          "isUnique": false
-        },
-        "events_environment_idx": {
-          "name": "events_environment_idx",
-          "columns": [
-            "environment_id"
-          ],
-          "isUnique": false
-        },
-        "events_completed_item_truncation_idx": {
-          "name": "events_completed_item_truncation_idx",
-          "columns": [
-            "item_kind",
-            "created_at",
-            "id"
-          ],
-          "isUnique": false,
-          "where": "\"events\".\"type\" = 'item/completed'"
-        }
-      },
-      "foreignKeys": {
-        "events_thread_id_threads_id_fk": {
-          "name": "events_thread_id_threads_id_fk",
-          "tableFrom": "events",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "events_environment_id_environments_id_fk": {
-          "name": "events_environment_id_environments_id_fk",
-          "tableFrom": "events",
-          "tableTo": "environments",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {
-        "events_scope_shape_check": {
-          "name": "events_scope_shape_check",
-          "value": "(\n        (\"events\".\"scope_kind\" = 'turn' AND \"events\".\"turn_id\" IS NOT NULL)\n        OR\n        (\"events\".\"scope_kind\" = 'thread' AND \"events\".\"turn_id\" IS NULL)\n      )"
-        }
-      }
-    },
-    "host_daemon_sessions": {
-      "name": "host_daemon_sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_id": {
-          "name": "host_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "instance_id": {
-          "name": "instance_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_name": {
-          "name": "host_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_type": {
-          "name": "host_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "data_dir": {
-          "name": "data_dir",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "protocol_version": {
-          "name": "protocol_version",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "heartbeat_interval_ms": {
-          "name": "heartbeat_interval_ms",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "lease_timeout_ms": {
-          "name": "lease_timeout_ms",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "lease_expires_at": {
-          "name": "lease_expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "closed_at": {
-          "name": "closed_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "close_reason": {
-          "name": "close_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "host_daemon_sessions_host_status_idx": {
-          "name": "host_daemon_sessions_host_status_idx",
-          "columns": [
-            "host_id",
-            "status"
-          ],
-          "isUnique": false
-        },
-        "host_daemon_sessions_host_latest_idx": {
-          "name": "host_daemon_sessions_host_latest_idx",
-          "columns": [
-            "host_id",
-            "updated_at",
-            "created_at",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "host_daemon_sessions_closed_prune_idx": {
-          "name": "host_daemon_sessions_closed_prune_idx",
-          "columns": [
-            "status",
-            "closed_at",
-            "id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "host_daemon_sessions_host_id_hosts_id_fk": {
-          "name": "host_daemon_sessions_host_id_hosts_id_fk",
-          "tableFrom": "host_daemon_sessions",
-          "tableTo": "hosts",
-          "columnsFrom": [
-            "host_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "hosts": {
-      "name": "hosts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "destroyed_at": {
-          "name": "destroyed_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_seen_at": {
-          "name": "last_seen_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "hosts_last_seen_idx": {
-          "name": "hosts_last_seen_idx",
-          "columns": [
-            "last_seen_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "maintenance_scan_cursors": {
-      "name": "maintenance_scan_cursors",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "policy": {
-          "name": "policy",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_kind": {
-          "name": "item_kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "output_path": {
-          "name": "output_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_created_at": {
-          "name": "last_created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_event_id": {
-          "name": "last_event_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "''"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "maintenance_scan_cursors_path_idx": {
-          "name": "maintenance_scan_cursors_path_idx",
-          "columns": [
-            "policy",
-            "version",
-            "item_kind",
-            "output_path"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "pending_interactions": {
-      "name": "pending_interactions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "turn_id": {
-          "name": "turn_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider_thread_id": {
-          "name": "provider_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider_request_id": {
-          "name": "provider_request_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "payload": {
-          "name": "payload",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resolution": {
-          "name": "resolution",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status_reason": {
-          "name": "status_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resolved_at": {
-          "name": "resolved_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "pending_interactions_provider_request_idx": {
-          "name": "pending_interactions_provider_request_idx",
-          "columns": [
-            "provider_id",
-            "provider_thread_id",
-            "provider_request_id"
-          ],
-          "isUnique": true
-        },
-        "pending_interactions_thread_created_idx": {
-          "name": "pending_interactions_thread_created_idx",
-          "columns": [
-            "thread_id",
-            "created_at"
-          ],
-          "isUnique": false
-        },
-        "pending_interactions_thread_status_created_idx": {
-          "name": "pending_interactions_thread_status_created_idx",
-          "columns": [
-            "thread_id",
-            "status",
-            "created_at"
-          ],
-          "isUnique": false
-        },
-        "pending_interactions_status_created_idx": {
-          "name": "pending_interactions_status_created_idx",
-          "columns": [
-            "status",
-            "created_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "pending_interactions_thread_id_threads_id_fk": {
-          "name": "pending_interactions_thread_id_threads_id_fk",
-          "tableFrom": "pending_interactions",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "project_execution_defaults": {
-      "name": "project_execution_defaults",
-      "columns": {
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "model": {
-          "name": "model",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "service_tier": {
-          "name": "service_tier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reasoning_level": {
-          "name": "reasoning_level",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "permission_mode": {
-          "name": "permission_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "project_execution_defaults_project_idx": {
-          "name": "project_execution_defaults_project_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "project_execution_defaults_project_id_projects_id_fk": {
-          "name": "project_execution_defaults_project_id_projects_id_fk",
-          "tableFrom": "project_execution_defaults",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "project_sources": {
-      "name": "project_sources",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_id": {
-          "name": "host_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_default": {
-          "name": "is_default",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "project_sources_project_idx": {
-          "name": "project_sources_project_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "project_sources_host_idx": {
-          "name": "project_sources_host_idx",
-          "columns": [
-            "host_id"
-          ],
-          "isUnique": false
-        },
-        "project_sources_project_host_idx": {
-          "name": "project_sources_project_host_idx",
-          "columns": [
-            "project_id",
-            "host_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "project_sources_project_id_projects_id_fk": {
-          "name": "project_sources_project_id_projects_id_fk",
-          "tableFrom": "project_sources",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "project_sources_host_id_hosts_id_fk": {
-          "name": "project_sources_host_id_hosts_id_fk",
-          "tableFrom": "project_sources",
-          "tableTo": "hosts",
-          "columnsFrom": [
-            "host_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {
-        "project_sources_shape_check": {
-          "name": "project_sources_shape_check",
-          "value": "(\n        \"project_sources\".\"type\" = 'local_path' AND \"project_sources\".\"host_id\" IS NOT NULL AND \"project_sources\".\"path\" IS NOT NULL\n      )"
-        }
-      }
-    },
-    "projects": {
-      "name": "projects",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "kind": {
-          "name": "kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'standard'"
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sort_key": {
-          "name": "sort_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'V'"
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "projects_updated_idx": {
-          "name": "projects_updated_idx",
-          "columns": [
-            "updated_at"
-          ],
-          "isUnique": false
-        },
-        "projects_deleted_idx": {
-          "name": "projects_deleted_idx",
-          "columns": [
-            "deleted_at"
-          ],
-          "isUnique": false
-        },
-        "projects_sort_idx": {
-          "name": "projects_sort_idx",
-          "columns": [
-            "sort_key",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "projects_personal_singleton_idx": {
-          "name": "projects_personal_singleton_idx",
-          "columns": [
-            "kind"
-          ],
-          "isUnique": true,
-          "where": "\"projects\".\"kind\" = 'personal'"
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "prompt_history_entries": {
-      "name": "prompt_history_entries",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "scope": {
-          "name": "scope",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "request_sequence": {
-          "name": "request_sequence",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "input": {
-          "name": "input",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "prompt_history_entries_thread_request_idx": {
-          "name": "prompt_history_entries_thread_request_idx",
-          "columns": [
-            "thread_id",
-            "request_sequence"
-          ],
-          "isUnique": true
-        },
-        "prompt_history_entries_project_scope_created_idx": {
-          "name": "prompt_history_entries_project_scope_created_idx",
-          "columns": [
-            "project_id",
-            "scope",
-            "created_at",
-            "request_sequence",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "prompt_history_entries_thread_scope_created_idx": {
-          "name": "prompt_history_entries_thread_scope_created_idx",
-          "columns": [
-            "thread_id",
-            "scope",
-            "created_at",
-            "request_sequence",
-            "id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "prompt_history_entries_project_id_projects_id_fk": {
-          "name": "prompt_history_entries_project_id_projects_id_fk",
-          "tableFrom": "prompt_history_entries",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "prompt_history_entries_thread_id_threads_id_fk": {
-          "name": "prompt_history_entries_thread_id_threads_id_fk",
-          "tableFrom": "prompt_history_entries",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "queued_thread_messages": {
-      "name": "queued_thread_messages",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sender_thread_id": {
-          "name": "sender_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "model": {
-          "name": "model",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reasoning_level": {
-          "name": "reasoning_level",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "permission_mode": {
-          "name": "permission_mode",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "service_tier": {
-          "name": "service_tier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "claimed_at": {
-          "name": "claimed_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "claim_token": {
-          "name": "claim_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sort_key": {
-          "name": "sort_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "queued_thread_messages_thread_created_idx": {
-          "name": "queued_thread_messages_thread_created_idx",
-          "columns": [
-            "thread_id",
-            "created_at",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "queued_thread_messages_thread_sort_idx": {
-          "name": "queued_thread_messages_thread_sort_idx",
-          "columns": [
-            "thread_id",
-            "sort_key",
-            "id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "queued_thread_messages_thread_id_threads_id_fk": {
-          "name": "queued_thread_messages_thread_id_threads_id_fk",
-          "tableFrom": "queued_thread_messages",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "system_experiments": {
-      "name": "system_experiments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "claude_code_mock_cli_traffic": {
-          "name": "claude_code_mock_cli_traffic",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "popout_chat": {
-          "name": "popout_chat",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "popout_chat_hotkey": {
-          "name": "popout_chat_hotkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "terminal_sessions": {
-      "name": "terminal_sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "environment_id": {
-          "name": "environment_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "host_id": {
-          "name": "host_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "daemon_session_id": {
-          "name": "daemon_session_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "initial_cwd": {
-          "name": "initial_cwd",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cols": {
-          "name": "cols",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rows": {
-          "name": "rows",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "exit_code": {
-          "name": "exit_code",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "close_reason": {
-          "name": "close_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_user_input_at": {
-          "name": "last_user_input_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "terminal_sessions_thread_status_updated_idx": {
-          "name": "terminal_sessions_thread_status_updated_idx",
-          "columns": [
-            "thread_id",
-            "status",
-            "updated_at"
-          ],
-          "isUnique": false
-        },
-        "terminal_sessions_environment_status_idx": {
-          "name": "terminal_sessions_environment_status_idx",
-          "columns": [
-            "environment_id",
-            "status"
-          ],
-          "isUnique": false
-        },
-        "terminal_sessions_host_status_idx": {
-          "name": "terminal_sessions_host_status_idx",
-          "columns": [
-            "host_id",
-            "status"
-          ],
-          "isUnique": false
-        },
-        "terminal_sessions_daemon_session_idx": {
-          "name": "terminal_sessions_daemon_session_idx",
-          "columns": [
-            "daemon_session_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "terminal_sessions_thread_id_threads_id_fk": {
-          "name": "terminal_sessions_thread_id_threads_id_fk",
-          "tableFrom": "terminal_sessions",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "terminal_sessions_environment_id_environments_id_fk": {
-          "name": "terminal_sessions_environment_id_environments_id_fk",
-          "tableFrom": "terminal_sessions",
-          "tableTo": "environments",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "terminal_sessions_host_id_hosts_id_fk": {
-          "name": "terminal_sessions_host_id_hosts_id_fk",
-          "tableFrom": "terminal_sessions",
-          "tableTo": "hosts",
-          "columnsFrom": [
-            "host_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk": {
-          "name": "terminal_sessions_daemon_session_id_host_daemon_sessions_id_fk",
-          "tableFrom": "terminal_sessions",
-          "tableTo": "host_daemon_sessions",
-          "columnsFrom": [
-            "daemon_session_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "thread_dynamic_context_file_states": {
-      "name": "thread_dynamic_context_file_states",
-      "columns": {
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "file_key": {
-          "name": "file_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content_status": {
-          "name": "content_status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content_hash": {
-          "name": "content_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "shown_at": {
-          "name": "shown_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "thread_dynamic_context_file_states_thread_file_idx": {
-          "name": "thread_dynamic_context_file_states_thread_file_idx",
-          "columns": [
-            "thread_id",
-            "file_key"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "thread_dynamic_context_file_states_thread_id_threads_id_fk": {
-          "name": "thread_dynamic_context_file_states_thread_id_threads_id_fk",
-          "tableFrom": "thread_dynamic_context_file_states",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "thread_folders": {
-      "name": "thread_folders",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "thread_folders_global_path_idx": {
-          "name": "thread_folders_global_path_idx",
-          "columns": [
-            "path"
-          ],
-          "isUnique": true,
-          "where": "\"thread_folders\".\"project_id\" IS NULL"
-        },
-        "thread_folders_project_path_idx": {
-          "name": "thread_folders_project_path_idx",
-          "columns": [
-            "project_id",
-            "path"
-          ],
-          "isUnique": true,
-          "where": "\"thread_folders\".\"project_id\" IS NOT NULL"
-        },
-        "thread_folders_project_idx": {
-          "name": "thread_folders_project_idx",
-          "columns": [
-            "project_id"
-          ],
-          "isUnique": false
-        },
-        "thread_folders_updated_idx": {
-          "name": "thread_folders_updated_idx",
-          "columns": [
-            "updated_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "thread_folders_project_id_projects_id_fk": {
-          "name": "thread_folders_project_id_projects_id_fk",
-          "tableFrom": "thread_folders",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "thread_search_segments": {
-      "name": "thread_search_segments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "thread_id": {
-          "name": "thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source_kind": {
-          "name": "source_kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source_key": {
-          "name": "source_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source_seq": {
-          "name": "source_seq",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "thread_search_segments_source_idx": {
-          "name": "thread_search_segments_source_idx",
-          "columns": [
-            "thread_id",
-            "source_kind",
-            "source_key"
-          ],
-          "isUnique": true
-        },
-        "thread_search_segments_thread_idx": {
-          "name": "thread_search_segments_thread_idx",
-          "columns": [
-            "thread_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "thread_search_segments_thread_id_threads_id_fk": {
-          "name": "thread_search_segments_thread_id_threads_id_fk",
-          "tableFrom": "thread_search_segments",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "threads": {
-      "name": "threads",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "project_id": {
-          "name": "project_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "environment_id": {
-          "name": "environment_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "model_override": {
-          "name": "model_override",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "reasoning_level_override": {
-          "name": "reasoning_level_override",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title_fallback": {
-          "name": "title_fallback",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "folder_path": {
-          "name": "folder_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'starting'"
-        },
-        "parent_thread_id": {
-          "name": "parent_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source_thread_id": {
-          "name": "source_thread_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "origin_kind": {
-          "name": "origin_kind",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "child_origin": {
-          "name": "child_origin",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "archived_at": {
-          "name": "archived_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pinned_at": {
-          "name": "pinned_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pin_sort_key": {
-          "name": "pin_sort_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_read_at": {
-          "name": "last_read_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "latest_attention_at": {
-          "name": "latest_attention_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "threads_project_updated_idx": {
-          "name": "threads_project_updated_idx",
-          "columns": [
-            "project_id",
-            "updated_at"
-          ],
-          "isUnique": false
-        },
-        "threads_project_archived_deleted_idx": {
-          "name": "threads_project_archived_deleted_idx",
-          "columns": [
-            "project_id",
-            "archived_at",
-            "deleted_at",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "threads_pin_sort_idx": {
-          "name": "threads_pin_sort_idx",
-          "columns": [
-            "archived_at",
-            "deleted_at",
-            "pin_sort_key",
-            "id"
-          ],
-          "isUnique": false,
-          "where": "\"threads\".\"pinned_at\" IS NOT NULL"
-        },
-        "threads_environment_idx": {
-          "name": "threads_environment_idx",
-          "columns": [
-            "environment_id"
-          ],
-          "isUnique": false
-        },
-        "threads_parent_idx": {
-          "name": "threads_parent_idx",
-          "columns": [
-            "parent_thread_id"
-          ],
-          "isUnique": false
-        },
-        "threads_source_origin_idx": {
-          "name": "threads_source_origin_idx",
-          "columns": [
-            "source_thread_id",
-            "origin_kind"
-          ],
-          "isUnique": false
-        },
-        "threads_archived_status_idx": {
-          "name": "threads_archived_status_idx",
-          "columns": [
-            "archived_at",
-            "status"
-          ],
-          "isUnique": false
-        },
-        "threads_environment_archived_deleted_idx": {
-          "name": "threads_environment_archived_deleted_idx",
-          "columns": [
-            "environment_id",
-            "archived_at",
-            "deleted_at"
-          ],
-          "isUnique": false
-        },
-        "threads_active_maintenance_idx": {
-          "name": "threads_active_maintenance_idx",
-          "columns": [
-            "status"
-          ],
-          "isUnique": false,
-          "where": "\"threads\".\"deleted_at\" IS NULL"
-        }
-      },
-      "foreignKeys": {
-        "threads_project_id_projects_id_fk": {
-          "name": "threads_project_id_projects_id_fk",
-          "tableFrom": "threads",
-          "tableTo": "projects",
-          "columnsFrom": [
-            "project_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "threads_environment_id_environments_id_fk": {
-          "name": "threads_environment_id_environments_id_fk",
-          "tableFrom": "threads",
-          "tableTo": "environments",
-          "columnsFrom": [
-            "environment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        },
-        "threads_parent_thread_id_threads_id_fk": {
-          "name": "threads_parent_thread_id_threads_id_fk",
-          "tableFrom": "threads",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "parent_thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        },
-        "threads_source_thread_id_threads_id_fk": {
-          "name": "threads_source_thread_id_threads_id_fk",
-          "tableFrom": "threads",
-          "tableTo": "threads",
-          "columnsFrom": [
-            "source_thread_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index c361ab1f8..d007f1d99 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -309,13 +309,6 @@
       "when": 1781851451425,
       "tag": "0043_unique_phantom_reporter",
       "breakpoints": true
-    },
-    {
-      "idx": 44,
-      "version": "6",
-      "when": 1781856789567,
-      "tag": "0044_solid_mysterio",
-      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/data/thread-folders.ts b/packages/db/src/data/thread-folders.ts
index fc2e932a0..1a39d541d 100644
--- a/packages/db/src/data/thread-folders.ts
+++ b/packages/db/src/data/thread-folders.ts
@@ -1,4 +1,4 @@
-import { and, asc, eq, isNull, or, sql } from "drizzle-orm";
+import { asc, eq, or, sql } from "drizzle-orm";
 import { PERSONAL_PROJECT_ID } from "@bb/domain";
 import type {
   DbConnection,
@@ -15,18 +15,15 @@ export type ThreadFolderRow = typeof threadFolders.$inferSelect;
 
 export interface CreateThreadFolderInput {
   path: string;
-  projectId?: string | null;
 }
 
 export interface RenameThreadFolderInput {
   path: string;
   newPath: string;
-  projectId?: string | null;
 }
 
 export interface DeleteThreadFolderInput {
   path: string;
-  projectId?: string | null;
 }
 
 export interface ThreadFolderMutationResult {
@@ -67,22 +64,6 @@ function folderPathSubtreeFilter(
   );
 }
 
-function folderProjectScopeFilter(projectId: string | null | undefined) {
-  if (projectId === undefined) {
-    return undefined;
-  }
-  return projectId === null
-    ? isNull(threadFolders.projectId)
-    : eq(threadFolders.projectId, projectId);
-}
-
-function threadProjectScopeFilter(projectId: string | null | undefined) {
-  if (projectId === undefined) {
-    return undefined;
-  }
-  return projectId === null ? sql`1 = 0` : eq(threads.projectId, projectId);
-}
-
 function replaceFolderPathPrefix(
   value: string,
   oldPath: string,
@@ -121,21 +102,16 @@ export function isThreadFolderDescendantPath(
 export function getThreadFolderByPath(
   db: DbQueryConnection,
   path: string,
-  projectId: string | null = null,
 ): ThreadFolderRow | null {
   const normalized = normalizeThreadFolderPath(path);
   if (!normalized) {
     return null;
   }
-  const projectFilter =
-    projectId === null
-      ? isNull(threadFolders.projectId)
-      : eq(threadFolders.projectId, projectId);
   return (
     db
       .select()
       .from(threadFolders)
-      .where(and(eq(threadFolders.path, normalized), projectFilter))
+      .where(eq(threadFolders.path, normalized))
       .get() ?? null
   );
 }
@@ -144,11 +120,7 @@ export function listThreadFolders(db: DbQueryConnection): ThreadFolderRow[] {
   return db
     .select()
     .from(threadFolders)
-    .orderBy(
-      asc(threadFolders.projectId),
-      asc(threadFolders.path),
-      asc(threadFolders.id),
-    )
+    .orderBy(asc(threadFolders.path), asc(threadFolders.id))
     .all();
 }
 
@@ -156,13 +128,11 @@ export function ensureThreadFolderPath(
   db: ThreadFolderWriteConnection,
   notifier: DbNotifier,
   path: string | null | undefined,
-  projectId: string | null = null,
 ): ThreadFolderRow | null {
   const normalized = normalizeThreadFolderPath(path);
   if (!normalized) {
     return null;
   }
-  const scopedProjectId = projectId ?? null;
 
   const now = Date.now();
   let createdAny = false;
@@ -173,7 +143,6 @@ export function ensureThreadFolderPath(
         .insert(threadFolders)
         .values({
           id: createThreadFolderId(),
-          projectId: scopedProjectId,
           path: ancestorPath,
           createdAt: now,
           updatedAt: now,
@@ -186,13 +155,11 @@ export function ensureThreadFolderPath(
       deepest = inserted;
       continue;
     }
-    deepest = getThreadFolderByPath(db, ancestorPath, scopedProjectId);
+    deepest = getThreadFolderByPath(db, ancestorPath);
   }
 
   if (createdAny) {
-    notifier.notifyProject(scopedProjectId ?? PERSONAL_PROJECT_ID, [
-      "threads-changed",
-    ]);
+    notifier.notifyProject(PERSONAL_PROJECT_ID, ["threads-changed"]);
   }
   return deepest;
 }
@@ -202,12 +169,7 @@ export function createThreadFolder(
   notifier: DbNotifier,
   input: CreateThreadFolderInput,
 ): ThreadFolderRow {
-  const folder = ensureThreadFolderPath(
-    db,
-    notifier,
-    input.path,
-    input.projectId ?? null,
-  );
+  const folder = ensureThreadFolderPath(db, notifier, input.path);
   if (!folder) {
     throw new Error("Thread folder path cannot be empty");
   }
@@ -236,12 +198,7 @@ export function renameThreadFolder(
       const matchingFolders = tx
         .select()
         .from(threadFolders)
-        .where(
-          and(
-            folderPathSubtreeFilter(threadFolders.path, path),
-            folderProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
         .all();
       const matchingThreads = tx
         .select({
@@ -250,12 +207,7 @@ export function renameThreadFolder(
           folderPath: threads.folderPath,
         })
         .from(threads)
-        .where(
-          and(
-            folderPathSubtreeFilter(threads.folderPath, path),
-            threadProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threads.folderPath, path))
         .all();
 
       if (matchingFolders.length === 0 && matchingThreads.length === 0) {
@@ -263,22 +215,18 @@ export function renameThreadFolder(
       }
 
       tx.delete(threadFolders)
-        .where(
-          and(
-            folderPathSubtreeFilter(threadFolders.path, path),
-            folderProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
         .run();
 
-      const affectedProjects = new Set<string | null>();
+      // Folders are a single global namespace keyed by path, so the global
+      // folder list (PERSONAL_PROJECT_ID) always refreshes; each moved thread's
+      // own project refreshes too.
+      const affectedProjects = new Set<string | null>([null]);
       for (const folder of matchingFolders) {
-        affectedProjects.add(folder.projectId);
         ensureThreadFolderPath(
           tx,
           notifier,
           replaceFolderPathPrefix(folder.path, path, newPath),
-          folder.projectId,
         );
       }
 
@@ -293,7 +241,7 @@ export function renameThreadFolder(
           newPath,
         );
         affectedProjects.add(thread.projectId);
-        ensureThreadFolderPath(tx, notifier, nextFolderPath, thread.projectId);
+        ensureThreadFolderPath(tx, notifier, nextFolderPath);
         tx.update(threads)
           .set({ folderPath: nextFolderPath, updatedAt: now })
           .where(eq(threads.id, thread.id))
@@ -325,12 +273,7 @@ export function deleteThreadFolder(
       const matchingFolders = tx
         .select()
         .from(threadFolders)
-        .where(
-          and(
-            folderPathSubtreeFilter(threadFolders.path, path),
-            folderProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
         .all();
       const matchingThreads = tx
         .select({
@@ -338,12 +281,7 @@ export function deleteThreadFolder(
           projectId: threads.projectId,
         })
         .from(threads)
-        .where(
-          and(
-            folderPathSubtreeFilter(threads.folderPath, path),
-            threadProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threads.folderPath, path))
         .all();
 
       if (matchingFolders.length === 0 && matchingThreads.length === 0) {
@@ -351,18 +289,13 @@ export function deleteThreadFolder(
       }
 
       tx.delete(threadFolders)
-        .where(
-          and(
-            folderPathSubtreeFilter(threadFolders.path, path),
-            folderProjectScopeFilter(input.projectId),
-          ),
-        )
+        .where(folderPathSubtreeFilter(threadFolders.path, path))
         .run();
 
       const now = Date.now();
-      const affectedProjects = new Set<string | null>(
-        matchingFolders.map((folder) => folder.projectId),
-      );
+      // The global folder list (PERSONAL_PROJECT_ID) always refreshes; each
+      // cleared thread's own project refreshes too.
+      const affectedProjects = new Set<string | null>([null]);
       for (const thread of matchingThreads) {
         affectedProjects.add(thread.projectId);
         tx.update(threads)
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index 507f5c570..6acd2151a 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -288,12 +288,7 @@ export function createThread(
         })
         .returning()
         .get();
-      ensureThreadFolderPath(
-        tx,
-        notifier,
-        createdThread.folderPath,
-        createdThread.projectId,
-      );
+      ensureThreadFolderPath(tx, notifier, createdThread.folderPath);
       upsertThreadTitleSearchSegments(tx, {
         threadId: createdThread.id,
         title: createdThread.title,
@@ -1559,7 +1554,7 @@ export function updateThread(
   const set: Partial<typeof threads.$inferInsert> = { updatedAt: now };
   if ("title" in input) set.title = input.title;
   if ("folderPath" in input) {
-    ensureThreadFolderPath(db, notifier, input.folderPath, existing.projectId);
+    ensureThreadFolderPath(db, notifier, input.folderPath);
     set.folderPath = input.folderPath;
   }
   if ("environmentId" in input) set.environmentId = input.environmentId;
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index e20d0d8b4..db3b76fc7 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -311,21 +311,12 @@ export const threadFolders = sqliteTable(
   "thread_folders",
   {
     id: text("id").primaryKey(),
-    projectId: text("project_id").references(() => projects.id, {
-      onDelete: "cascade",
-    }),
     path: text("path").notNull(),
     createdAt: integer("created_at").notNull(),
     updatedAt: integer("updated_at").notNull(),
   },
   (table) => [
-    uniqueIndex("thread_folders_global_path_idx")
-      .on(table.path)
-      .where(sql`${table.projectId} IS NULL`),
-    uniqueIndex("thread_folders_project_path_idx")
-      .on(table.projectId, table.path)
-      .where(sql`${table.projectId} IS NOT NULL`),
-    index("thread_folders_project_idx").on(table.projectId),
+    uniqueIndex("thread_folders_path_idx").on(table.path),
     index("thread_folders_updated_idx").on(table.updatedAt),
   ],
 );
diff --git a/packages/db/test/data/threads.test.ts b/packages/db/test/data/threads.test.ts
index dca8cd6ae..d910ace57 100644
--- a/packages/db/test/data/threads.test.ts
+++ b/packages/db/test/data/threads.test.ts
@@ -694,14 +694,9 @@ describe("threads", () => {
     });
 
     expect(updated?.folderPath).toBe("Work/Q3");
-    expect(
-      listThreadFolders(db).map((folder) => ({
-        path: folder.path,
-        projectId: folder.projectId,
-      })),
-    ).toEqual([
-      { path: "Work", projectId: project.id },
-      { path: "Work/Q3", projectId: project.id },
+    expect(listThreadFolders(db).map((folder) => folder.path)).toEqual([
+      "Work",
+      "Work/Q3",
     ]);
     expect(spy.notifyThread).toHaveBeenCalledWith(
       thread.id,
@@ -722,45 +717,9 @@ describe("threads", () => {
       "Work",
       "Work/Q3",
     ]);
-    expect(folder.projectId).toBeNull();
   });
 
-  it("scopes explicit thread folders by project", () => {
-    const { db, host, project } = setup();
-    const { project: otherProject } = createProject(db, noopNotifier, {
-      name: "other-project",
-      source: { type: "local_path", hostId: host.id, path: "/tmp/other" },
-    });
-
-    const first = createThreadFolder(db, noopNotifier, {
-      path: "Work",
-      projectId: project.id,
-    });
-    const second = createThreadFolder(db, noopNotifier, {
-      path: "Work",
-      projectId: otherProject.id,
-    });
-
-    expect(first.projectId).toBe(project.id);
-    expect(second.projectId).toBe(otherProject.id);
-    const folders = listThreadFolders(db)
-      .map((entry) => ({
-        path: entry.path,
-        projectId: entry.projectId,
-      }))
-      .sort((left, right) =>
-        (left.projectId ?? "").localeCompare(right.projectId ?? ""),
-      );
-    const expectedFolders = [
-      { path: "Work", projectId: project.id },
-      { path: "Work", projectId: otherProject.id },
-    ].sort((left, right) =>
-      (left.projectId ?? "").localeCompare(right.projectId ?? ""),
-    );
-    expect(folders).toEqual(expectedFolders);
-  });
-
-  it("renames thread folders and moves descendant threads", () => {
+  it("renames thread folders and moves descendant threads across projects", () => {
     const { db, host, project } = setup();
     const { project: otherProject } = createProject(db, noopNotifier, {
       name: "other-project",
@@ -793,30 +752,11 @@ describe("threads", () => {
     expect(result).toEqual({ path: "Archive", updatedThreadCount: 2 });
     expect(getThread(db, firstThread.id)?.folderPath).toBe("Archive/Q3");
     expect(getThread(db, secondThread.id)?.folderPath).toBe("Archive");
-    expect(
-      listThreadFolders(db)
-        .map((folder) => ({
-          path: folder.path,
-          projectId: folder.projectId,
-        }))
-        .sort((left, right) =>
-          `${left.projectId ?? ""}:${left.path}`.localeCompare(
-            `${right.projectId ?? ""}:${right.path}`,
-          ),
-        ),
-    ).toEqual(
-      [
-        { path: "Archive", projectId: null },
-        { path: "Archive/Empty", projectId: null },
-        { path: "Archive", projectId: project.id },
-        { path: "Archive/Q3", projectId: project.id },
-        { path: "Archive", projectId: otherProject.id },
-      ].sort((left, right) =>
-        `${left.projectId ?? ""}:${left.path}`.localeCompare(
-          `${right.projectId ?? ""}:${right.path}`,
-        ),
-      ),
-    );
+    expect(listThreadFolders(db).map((folder) => folder.path).sort()).toEqual([
+      "Archive",
+      "Archive/Empty",
+      "Archive/Q3",
+    ]);
     expect(spy.notifyThread).toHaveBeenCalledWith(
       firstThread.id,
       ["title-changed"],
@@ -829,7 +769,7 @@ describe("threads", () => {
     );
   });
 
-  it("renames only one project folder scope when projectId is supplied", () => {
+  it("renames a folder for threads across every project", () => {
     const { db, host, project } = setup();
     const { project: otherProject } = createProject(db, noopNotifier, {
       name: "other-project",
@@ -845,42 +785,19 @@ describe("threads", () => {
       providerId: "codex",
       folderPath: "Work/Q3",
     });
-    createThreadFolder(db, noopNotifier, { path: "Work/Global" });
 
     const result = renameThreadFolder(db, noopNotifier, {
       path: "Work",
       newPath: "Archive",
-      projectId: project.id,
     });
 
-    expect(result).toEqual({ path: "Archive", updatedThreadCount: 1 });
+    expect(result).toEqual({ path: "Archive", updatedThreadCount: 2 });
     expect(getThread(db, projectThread.id)?.folderPath).toBe("Archive/Q3");
-    expect(getThread(db, otherProjectThread.id)?.folderPath).toBe("Work/Q3");
-    expect(
-      listThreadFolders(db)
-        .map((folder) => ({
-          path: folder.path,
-          projectId: folder.projectId,
-        }))
-        .sort((left, right) =>
-          `${left.projectId ?? ""}:${left.path}`.localeCompare(
-            `${right.projectId ?? ""}:${right.path}`,
-          ),
-        ),
-    ).toEqual(
-      [
-        { path: "Work", projectId: null },
-        { path: "Work/Global", projectId: null },
-        { path: "Archive", projectId: project.id },
-        { path: "Archive/Q3", projectId: project.id },
-        { path: "Work", projectId: otherProject.id },
-        { path: "Work/Q3", projectId: otherProject.id },
-      ].sort((left, right) =>
-        `${left.projectId ?? ""}:${left.path}`.localeCompare(
-          `${right.projectId ?? ""}:${right.path}`,
-        ),
-      ),
-    );
+    expect(getThread(db, otherProjectThread.id)?.folderPath).toBe("Archive/Q3");
+    expect(listThreadFolders(db).map((folder) => folder.path).sort()).toEqual([
+      "Archive",
+      "Archive/Q3",
+    ]);
   });
 
   it("does not rename a thread folder into its own descendant", () => {
@@ -891,10 +808,7 @@ describe("threads", () => {
       folderPath: "Work/Q3",
     });
     createThreadFolder(db, noopNotifier, { path: "Work/Empty" });
-    const foldersBefore = listThreadFolders(db).map((folder) => ({
-      path: folder.path,
-      projectId: folder.projectId,
-    }));
+    const foldersBefore = listThreadFolders(db).map((folder) => folder.path);
 
     const result = renameThreadFolder(db, noopNotifier, {
       path: "Work",
@@ -903,12 +817,9 @@ describe("threads", () => {
 
     expect(result).toBeNull();
     expect(getThread(db, thread.id)?.folderPath).toBe("Work/Q3");
-    expect(
-      listThreadFolders(db).map((folder) => ({
-        path: folder.path,
-        projectId: folder.projectId,
-      })),
-    ).toEqual(foldersBefore);
+    expect(listThreadFolders(db).map((folder) => folder.path)).toEqual(
+      foldersBefore,
+    );
   });
 
   it("removes thread folders and clears descendant thread folder paths", () => {
@@ -927,7 +838,7 @@ describe("threads", () => {
     expect(listThreadFolders(db)).toEqual([]);
   });
 
-  it("removes only one project folder scope when projectId is supplied", () => {
+  it("removes a folder for threads across every project", () => {
     const { db, host, project } = setup();
     const { project: otherProject } = createProject(db, noopNotifier, {
       name: "other-project",
@@ -945,25 +856,12 @@ describe("threads", () => {
     });
     createThreadFolder(db, noopNotifier, { path: "Work/Global" });
 
-    const result = deleteThreadFolder(db, noopNotifier, {
-      path: "Work",
-      projectId: project.id,
-    });
+    const result = deleteThreadFolder(db, noopNotifier, { path: "Work" });
 
-    expect(result).toEqual({ path: "Work", updatedThreadCount: 1 });
+    expect(result).toEqual({ path: "Work", updatedThreadCount: 2 });
     expect(getThread(db, projectThread.id)?.folderPath).toBeNull();
-    expect(getThread(db, otherProjectThread.id)?.folderPath).toBe("Work/Q3");
-    expect(
-      listThreadFolders(db).map((folder) => ({
-        path: folder.path,
-        projectId: folder.projectId,
-      })),
-    ).toEqual([
-      { path: "Work", projectId: null },
-      { path: "Work/Global", projectId: null },
-      { path: "Work", projectId: otherProject.id },
-      { path: "Work/Q3", projectId: otherProject.id },
-    ]);
+    expect(getThread(db, otherProjectThread.id)?.folderPath).toBeNull();
+    expect(listThreadFolders(db)).toEqual([]);
   });
 
   it("notifies when a thread parent changes", () => {
diff --git a/packages/db/test/migrate.test.ts b/packages/db/test/migrate.test.ts
index 97b2fd162..8627f48af 100644
--- a/packages/db/test/migrate.test.ts
+++ b/packages/db/test/migrate.test.ts
@@ -389,9 +389,9 @@ function dropPost0023Tables(db: DbConnection): void {
 
 /**
  * Folder schema lands after thread-search (0042 folder_path column, 0043
- * thread_folders table, 0044 project scoping). Replay scenarios that rewind the
- * ledger past it must drop the schema too, or migrate() re-runs the ADD/CREATE
- * against a DB that already has them.
+ * thread_folders table). Replay scenarios that rewind the ledger past it must
+ * drop the schema too, or migrate() re-runs the ADD/CREATE against a DB that
+ * already has them.
  */
 function dropThreadFolderSchema(db: DbConnection): void {
   db.$client.exec("DROP TABLE IF EXISTS thread_folders;");
diff --git a/packages/server-contract/src/api/projects.ts b/packages/server-contract/src/api/projects.ts
index 668a66ba1..2cece0319 100644
--- a/packages/server-contract/src/api/projects.ts
+++ b/packages/server-contract/src/api/projects.ts
@@ -57,7 +57,6 @@ export type CreateProjectRequest = z.infer<typeof createProjectRequestSchema>;
 export const threadFolderSchema = z
   .object({
     id: z.string(),
-    projectId: z.string().min(1).nullable(),
     path: z.string().min(1),
     createdAt: z.number(),
     updatedAt: z.number(),
@@ -68,7 +67,6 @@ export type ThreadFolderResponse = z.infer<typeof threadFolderSchema>;
 export const createThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
-    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type CreateThreadFolderRequest = z.infer<
@@ -79,7 +77,6 @@ export const updateThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
     newPath: z.string().min(1),
-    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type UpdateThreadFolderRequest = z.infer<
@@ -89,7 +86,6 @@ export type UpdateThreadFolderRequest = z.infer<
 export const deleteThreadFolderRequestSchema = z
   .object({
     path: z.string().min(1),
-    projectId: z.string().min(1).nullable().optional(),
   })
   .strict();
 export type DeleteThreadFolderRequest = z.infer<

From a2fa0ef2a3ea3f32b96f15d2135149bb5bff2fae Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Sat, 20 Jun 2026 04:52:11 -0700
Subject: [PATCH 51/54] Polish sidebar, search, and thread-menu UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Sidebar menus: rename Organize→Group by, drop Group from the loose Threads
  header, narrow the Group/Sort menus and style their titles as section labels.
- Add icons + grouping dividers to all ... menus (thread/project/folder/
  threads-section); envelope icon for the read toggle; "Mark read/unread" and
  "View archive" labels.
- Tooltips: keep only sort, group, and the new project/folder/thread buttons;
  remove the rest (incl. native title tooltips) and dismiss on pointer leave.
- Drag affordances: unify the folder/loose drop-preview into one inserted
  placeholder; grab cursor on draggable threads.
- Cursors: pointer for clickable rows by default; project/folder header rows are
  static (caret is the click target); pointer on carets/top buttons.
- Carets get the standard sidebar hover style.
- Search: title-first results with a labeled 2-line message snippet, "Recent"
  empty state showing project + relative time; drop the per-row glyph and the
  Archived pill.
- Subtle empty-state text/icons; lighter selection token; lighter user-message
  bubble border; full-width Queued header toggle.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/.ladle/components.tsx                |   2 +-
 .../components/project/ProjectActionsMenu.tsx |  85 ++++---
 .../promptbox/banner/QueuedMessagesList.tsx   |   9 +-
 .../app/src/components/sidebar/AppSidebar.tsx |   9 +-
 .../src/components/sidebar/ProjectList.tsx    | 203 +++++++---------
 .../sidebar/ProjectListProjects.tsx           |   4 +-
 .../app/src/components/sidebar/ProjectRow.tsx | 227 +++++++++---------
 .../sidebar/SidebarChildToggleChevron.tsx     |   2 +-
 .../sidebar/SidebarFolderRow.stories.tsx      |  12 +-
 .../components/sidebar/SidebarFolderRow.tsx   |  63 +++--
 .../SidebarHistoryNavigationControls.tsx      |   1 -
 .../sidebar/SidebarThreadSearchPanel.tsx      |  11 +-
 .../SidebarViewOptionsMenu.stories.tsx        |  17 +-
 apps/app/src/components/sidebar/ThreadRow.tsx |  24 +-
 .../sidebar/ThreadSearchResultRow.tsx         |  81 ++++---
 .../components/sidebar/sidebarRowClasses.ts   |  11 +-
 .../thread/ThreadActionsMenu.test.tsx         |   6 +-
 .../components/thread/ThreadActionsMenu.tsx   |  48 +++-
 .../timeline/ConversationMessageContent.tsx   |   2 +-
 apps/app/src/components/ui/icon.tsx           |   8 +
 apps/app/src/components/ui/sidebar.tsx        |  10 +-
 21 files changed, 434 insertions(+), 401 deletions(-)

diff --git a/apps/app/.ladle/components.tsx b/apps/app/.ladle/components.tsx
index de4979a95..de4ffc1d9 100644
--- a/apps/app/.ladle/components.tsx
+++ b/apps/app/.ladle/components.tsx
@@ -66,7 +66,7 @@ export const Provider: GlobalProvider = ({ globalState, children }) => {
             }}
             highlighterOptions={{}}
           >
-            <TooltipProvider delayDuration={300}>
+            <TooltipProvider delayDuration={300} disableHoverableContent>
               <div className="min-h-screen text-foreground">
                 {children}
                 <AppToaster position="bottom-right" />
diff --git a/apps/app/src/components/project/ProjectActionsMenu.tsx b/apps/app/src/components/project/ProjectActionsMenu.tsx
index cf8665a57..ebd6f141f 100644
--- a/apps/app/src/components/project/ProjectActionsMenu.tsx
+++ b/apps/app/src/components/project/ProjectActionsMenu.tsx
@@ -3,7 +3,7 @@ import type { ProjectResponse } from "@bb/server-contract";
 import type { ReactNode } from "react";
 import { useNavigate } from "react-router-dom";
 import { Button } from "@/components/ui/button.js";
-import { Icon } from "@/components/ui/icon.js";
+import { Icon, type IconName } from "@/components/ui/icon.js";
 import { COARSE_POINTER_ICON_SIZE_CLASS } from "@/components/ui/coarse-pointer-sizing.js";
 import {
   ContextMenu,
@@ -40,6 +40,8 @@ interface ProjectActionsMenuProps extends ProjectActionsMenuBaseProps {
   triggerClassName?: string;
   align?: "start" | "center" | "end";
   onOpenChange?: (open: boolean) => void;
+  /** Suppress the trigger's hover tooltip (the sidebar keeps tooltips minimal). */
+  hideTriggerTooltip?: boolean;
 }
 
 interface ProjectActionsContextMenuProps extends ProjectActionsMenuBaseProps {
@@ -56,6 +58,7 @@ interface ProjectActionsMenuItemsProps extends ProjectActionsMenuBaseProps {
 interface ProjectActionMenuItemProps {
   children: ReactNode;
   className?: string;
+  icon: IconName;
   onSelect?: (event: Event) => void;
   surface: ProjectActionsMenuSurface;
 }
@@ -67,20 +70,29 @@ interface ProjectActionMenuSeparatorProps {
 function ProjectActionMenuItem({
   children,
   className,
+  icon,
   onSelect,
   surface,
 }: ProjectActionMenuItemProps) {
+  // The menu item base styling sizes/spaces a direct <svg> child, so the Icon
+  // renders inline before the label.
+  const content = (
+    <>
+      <Icon name={icon} aria-hidden="true" />
+      {children}
+    </>
+  );
   if (surface === "context") {
     return (
       <ContextMenuItem className={className} onSelect={onSelect}>
-        {children}
+        {content}
       </ContextMenuItem>
     );
   }
 
   return (
     <DropdownMenuItem className={className} onSelect={onSelect}>
-      {children}
+      {content}
     </DropdownMenuItem>
   );
 }
@@ -111,6 +123,7 @@ function ProjectActionsMenuItems({
     <>
       <ProjectActionMenuItem
         surface={surface}
+        icon="Settings"
         onSelect={() => {
           navigate(getProjectSettingsRoutePath(project.id));
         }}
@@ -119,15 +132,17 @@ function ProjectActionsMenuItems({
       </ProjectActionMenuItem>
       <ProjectActionMenuItem
         surface={surface}
+        icon="Archive"
         onSelect={() => {
           navigate(getProjectArchivedRoutePath(project.id));
         }}
       >
-        View archived threads
+        View archive
       </ProjectActionMenuItem>
       <ProjectActionMenuSeparator surface={surface} />
       <ProjectActionMenuItem
         surface={surface}
+        icon="Edit"
         onSelect={(event) => {
           if (surface === "dropdown") {
             event.preventDefault();
@@ -140,6 +155,7 @@ function ProjectActionsMenuItems({
       {showAddLocalPath ? (
         <ProjectActionMenuItem
           surface={surface}
+          icon="FolderPlus"
           onSelect={(event) => {
             if (surface === "dropdown") {
               event.preventDefault();
@@ -152,6 +168,7 @@ function ProjectActionsMenuItems({
       ) : null}
       <ProjectActionMenuItem
         surface={surface}
+        icon="Trash2"
         className="text-destructive focus:text-destructive"
         onSelect={(event) => {
           if (surface === "dropdown") {
@@ -171,36 +188,42 @@ export function ProjectActionsMenu({
   triggerClassName,
   align = "end",
   onOpenChange,
+  hideTriggerTooltip = false,
 }: ProjectActionsMenuProps) {
+  const trigger = (
+    <DropdownMenuTrigger asChild>
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon"
+        className={cn(
+          "rounded-md p-0 text-muted-foreground",
+          triggerClassName,
+          "data-[state=open]:bg-state-active data-[state=open]:text-foreground",
+        )}
+        aria-label={`${project.name} actions`}
+        title={undefined}
+        onClick={(event) => {
+          event.stopPropagation();
+        }}
+      >
+        <Icon
+          name="MoreHorizontal"
+          className={COARSE_POINTER_ICON_SIZE_CLASS}
+        />
+      </Button>
+    </DropdownMenuTrigger>
+  );
   return (
     <DropdownMenu onOpenChange={onOpenChange}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <DropdownMenuTrigger asChild>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon"
-              className={cn(
-                "rounded-md p-0 text-muted-foreground",
-                triggerClassName,
-                "data-[state=open]:bg-state-active data-[state=open]:text-foreground",
-              )}
-              aria-label={`${project.name} actions`}
-              title={undefined}
-              onClick={(event) => {
-                event.stopPropagation();
-              }}
-            >
-              <Icon
-                name="MoreHorizontal"
-                className={COARSE_POINTER_ICON_SIZE_CLASS}
-              />
-            </Button>
-          </DropdownMenuTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="bottom">Project actions</TooltipContent>
-      </Tooltip>
+      {hideTriggerTooltip ? (
+        trigger
+      ) : (
+        <Tooltip>
+          <TooltipTrigger asChild>{trigger}</TooltipTrigger>
+          <TooltipContent side="bottom">Project actions</TooltipContent>
+        </Tooltip>
+      )}
       <DropdownMenuContent align={align}>
         <ProjectActionsMenuItems project={project} surface="dropdown" />
       </DropdownMenuContent>
diff --git a/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx b/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
index 443566244..91ed549ee 100644
--- a/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
+++ b/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
@@ -247,7 +247,10 @@ const QueuedMessageRow = memo(function QueuedMessageRow({
             )}
             aria-hidden="true"
           />
-          <Icon name="ArrowTurnForward" className="size-3.5 shrink-0 opacity-70" />
+          <Icon
+            name="ArrowTurnForward"
+            className="size-3.5 shrink-0 opacity-70"
+          />
         </Button>
         <div className="min-w-0 flex-1">
           <div className="flex min-w-0 items-center gap-1 text-xs leading-4">
@@ -435,12 +438,12 @@ export function QueuedMessagesList({
       // coming up from behind the composer rather than floating above it.
       className="-mb-3 overflow-hidden rounded-b-none border-b-0 pb-3"
     >
-      <div className="px-2.5 pb-1 pt-2.5">
+      <div className="px-1.5 pb-1 pt-2.5">
         <button
           type="button"
           aria-expanded={isExpanded}
           onClick={() => setIsExpanded((prev) => !prev)}
-          className="-ml-2 flex items-center gap-1.5 rounded px-1 py-0.5 text-xs text-muted-foreground transition-colors hover:bg-state-hover"
+          className="flex w-full cursor-pointer items-center gap-1.5 rounded-md px-1.5 py-1 text-xs text-muted-foreground transition-colors hover:bg-state-hover"
         >
           <span className="opacity-70">Queued</span>
           <span className="text-2xs text-subtle-foreground">
diff --git a/apps/app/src/components/sidebar/AppSidebar.tsx b/apps/app/src/components/sidebar/AppSidebar.tsx
index 5f9cdc4b4..7f980053d 100644
--- a/apps/app/src/components/sidebar/AppSidebar.tsx
+++ b/apps/app/src/components/sidebar/AppSidebar.tsx
@@ -19,7 +19,6 @@ import {
   useCloseMobileSidebar,
   useSidebar,
 } from "@/components/ui/sidebar.js";
-import { COARSE_POINTER_CHILD_ICON_BUTTON_CLASS } from "@/components/ui/coarse-pointer-sizing.js";
 import { ProjectList, ProjectListActionButtons } from "./ProjectList";
 import { SidebarHistoryNavigationControls } from "./SidebarHistoryNavigationControls";
 import { useQuickCreateProjectController } from "@/hooks/useQuickCreateProject";
@@ -312,14 +311,10 @@ export function AppSidebar({
           <OverflowFade placement="above" tone="sidebar" size="sm" />
           <SidebarMenu className="flex-row items-center">
             <SidebarMenuItem>
-              <SidebarMenuButton
-                asChild
-                className={COARSE_POINTER_CHILD_ICON_BUTTON_CLASS}
-                tooltip="Settings"
-                aria-label="Settings"
-              >
+              <SidebarMenuButton asChild aria-label="Settings">
                 <Link to="/settings" onClick={closeOnMobile}>
                   <Icon name="Settings" />
+                  <span>Settings</span>
                 </Link>
               </SidebarMenuButton>
             </SidebarMenuItem>
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 54ab2bbff..374748a09 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -119,7 +119,6 @@ import {
   sidebarSortDirectionAtom,
   type SidebarChronologicalSort,
   type CollapsibleSidebarSectionId,
-  type SidebarOrganizationMode,
   type SidebarSectionId,
   type SidebarSortDirection,
 } from "./sidebarCollapsedAtoms";
@@ -203,10 +202,9 @@ interface ProjectListThreadsSectionActionsProps {
   onNewThread: () => void;
 }
 
-interface SidebarOrganizeOptionsMenuProps {
+interface SidebarGroupOptionsMenuProps {
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
-  onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
 }
 
 interface SidebarSortOptionsMenuProps {
@@ -234,11 +232,11 @@ const PROJECT_LIST_ACTION_BUTTON_CLASS = cn(
   SIDEBAR_STANDARD_ROW_PADDING_CLASS,
   SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
   COARSE_POINTER_ROW_HEIGHT_CLASS,
-  "min-w-0 justify-start overflow-hidden font-normal ring-sidebar-ring focus-visible:ring-2 disabled:opacity-70 max-md:pointer-coarse:[&_svg]:size-5",
+  "min-w-0 cursor-pointer justify-start overflow-hidden font-normal ring-sidebar-ring focus-visible:ring-2 disabled:cursor-default disabled:opacity-70 max-md:pointer-coarse:[&_svg]:size-5",
 );
 
 const PROJECT_LIST_ACTION_ICON_BUTTON_CLASS = cn(
-  "inline-flex shrink-0 items-center justify-center rounded-md text-sidebar-foreground/85 outline-none ring-sidebar-ring transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 disabled:opacity-50",
+  "inline-flex shrink-0 cursor-pointer items-center justify-center rounded-md text-sidebar-foreground/85 outline-none ring-sidebar-ring transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 disabled:cursor-default disabled:opacity-50",
   COARSE_POINTER_ROW_HEIGHT_CLASS,
   "w-8",
 );
@@ -277,7 +275,7 @@ type ToggleCollapsedId = (id: string) => void;
 type ToggleCollapsedSidebarSectionId = (
   id: CollapsibleSidebarSectionId,
 ) => void;
-type SidebarDisplayOptionsMenuKind = "organize" | "sort";
+type SidebarDisplayOptionsMenuKind = "group" | "sort";
 
 interface TopLevelSidebarSectionProps {
   label: string;
@@ -613,19 +611,19 @@ function ProjectListThreadsSectionActions({
   );
 }
 
-interface SidebarOrganizeMenuOptionProps {
+interface SidebarGroupMenuOptionProps {
   disabled?: boolean;
   label: string;
   selected: boolean;
   onSelect: (event: Event) => void;
 }
 
-function SidebarOrganizeMenuOption({
+function SidebarGroupMenuOption({
   disabled = false,
   label,
   selected,
   onSelect,
-}: SidebarOrganizeMenuOptionProps) {
+}: SidebarGroupMenuOptionProps) {
   return (
     <DropdownMenuItem
       disabled={disabled}
@@ -723,11 +721,10 @@ function SidebarSortMenuOption({
 // Shared organization menu rendered on both the Projects and Threads section
 // headers. The organization mode is global, so either header's menu drives the
 // whole sidebar.
-export function SidebarOrganizeOptionsMenu({
+export function SidebarGroupOptionsMenu({
   open,
   onOpenChange,
-  onOrganizationModeSelect,
-}: SidebarOrganizeOptionsMenuProps) {
+}: SidebarGroupOptionsMenuProps) {
   const [organizationMode, setOrganizationMode] = useAtom(
     sidebarOrganizationModeAtom,
   );
@@ -735,28 +732,32 @@ export function SidebarOrganizeOptionsMenu({
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
       <SidebarDisplayMenuTrigger
-        ariaLabel="Sidebar organization options"
+        ariaLabel="Sidebar grouping options"
         iconName="Layers"
-        tooltip="Organize"
+        tooltip="Group by"
       />
-      <DropdownMenuContent align="end" mobileTitle="Organize sidebar">
-        <DropdownMenuLabel>Organize by</DropdownMenuLabel>
-        <SidebarOrganizeMenuOption
+      <DropdownMenuContent
+        align="end"
+        mobileTitle="Group by"
+        className="min-w-0"
+      >
+        <DropdownMenuLabel className={CHROME_SECTION_LABEL_CLASS}>
+          Group by
+        </DropdownMenuLabel>
+        <SidebarGroupMenuOption
           label="Project"
           selected={organizationMode === "project"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("project");
-            onOrganizationModeSelect?.("project");
           }}
         />
-        <SidebarOrganizeMenuOption
+        <SidebarGroupMenuOption
           label="Folders"
           selected={organizationMode === "chronological"}
           onSelect={(event) => {
             event.preventDefault();
             setOrganizationMode("chronological");
-            onOrganizationModeSelect?.("chronological");
           }}
         />
       </DropdownMenuContent>
@@ -796,8 +797,10 @@ export function SidebarSortOptionsMenu({
         iconName="ArrowUpDown"
         tooltip="Sort"
       />
-      <DropdownMenuContent align="end" mobileTitle="Sort">
-        <DropdownMenuLabel>Sort by</DropdownMenuLabel>
+      <DropdownMenuContent align="end" mobileTitle="Sort" className="min-w-0">
+        <DropdownMenuLabel className={CHROME_SECTION_LABEL_CLASS}>
+          Sort by
+        </DropdownMenuLabel>
         <SidebarSortMenuOption
           label="Updated at"
           sort="updated"
@@ -835,33 +838,29 @@ function SidebarThreadActionsMenu({
 
   return (
     <DropdownMenu open={open} onOpenChange={onOpenChange}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <DropdownMenuTrigger asChild>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon"
-              aria-label="Threads actions"
-              title={undefined}
-              className={cn(
-                "rounded-md p-0 text-muted-foreground",
-                "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
-                COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-              )}
-            >
-              <Icon
-                name="MoreHorizontal"
-                className={COARSE_POINTER_ICON_SIZE_CLASS}
-              />
-            </Button>
-          </DropdownMenuTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="bottom">Threads actions</TooltipContent>
-      </Tooltip>
+      <DropdownMenuTrigger asChild>
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          aria-label="Threads actions"
+          title={undefined}
+          className={cn(
+            "rounded-md p-0 text-muted-foreground",
+            "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
+            COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+          )}
+        >
+          <Icon
+            name="MoreHorizontal"
+            className={COARSE_POINTER_ICON_SIZE_CLASS}
+          />
+        </Button>
+      </DropdownMenuTrigger>
       <DropdownMenuContent align="end" mobileTitle="Threads actions">
         <DropdownMenuItem onSelect={onOpenArchivedThreads}>
-          View archived threads
+          <Icon name="Archive" aria-hidden="true" />
+          View archive
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
@@ -871,23 +870,20 @@ function SidebarThreadActionsMenu({
 interface SidebarDisplayOptionsActionsProps {
   open: SidebarDisplayOptionsMenuKind | null;
   onOpenChange: (menu: SidebarDisplayOptionsMenuKind, open: boolean) => void;
-  onOrganizationModeSelect?: (mode: SidebarOrganizationMode) => void;
 }
 
-// The Organize + Sort menu pair shown on every sidebar section header. Shared
-// so the project, folders, and threads headers stay identical and changes land
-// in one place instead of being copied per view.
+// The Group + Sort menu pair shown on the primary section header (Projects in
+// project mode, Folders in the folders view). Shared so both headers stay
+// identical and changes land in one place instead of being copied per view.
 function SidebarDisplayOptionsActions({
   open,
   onOpenChange,
-  onOrganizationModeSelect,
 }: SidebarDisplayOptionsActionsProps) {
   return (
     <>
-      <SidebarOrganizeOptionsMenu
-        open={open === "organize"}
-        onOpenChange={(next) => onOpenChange("organize", next)}
-        onOrganizationModeSelect={onOrganizationModeSelect}
+      <SidebarGroupOptionsMenu
+        open={open === "group"}
+        onOpenChange={(next) => onOpenChange("group", next)}
       />
       <SidebarSortOptionsMenu
         open={open === "sort"}
@@ -910,9 +906,11 @@ interface SidebarThreadsSectionActionsProps {
   onNewThread: () => void;
 }
 
-// The complete Threads-section header cluster (archived menu + display options +
-// new thread). One component drives the Threads header in both project mode and
-// the folders view, so they can never drift apart.
+// The complete Threads-section header cluster (archived menu + sort + new
+// thread). One component drives the Threads header in both project mode and the
+// folders view, so they can never drift apart. The Threads section is always the
+// loose/unfiled set, so it offers sorting but not the Group-by toggle (that
+// lives on the primary section header).
 function SidebarThreadsSectionActions({
   displayOptionsOpen,
   onDisplayOptionsOpenChange,
@@ -929,9 +927,9 @@ function SidebarThreadsSectionActions({
         onOpenChange={onActionsMenuOpenChange}
         onOpenArchivedThreads={onOpenArchivedThreads}
       />
-      <SidebarDisplayOptionsActions
-        open={displayOptionsOpen}
-        onOpenChange={onDisplayOptionsOpenChange}
+      <SidebarSortOptionsMenu
+        open={displayOptionsOpen === "sort"}
+        onOpenChange={(next) => onDisplayOptionsOpenChange("sort", next)}
       />
       <ProjectListThreadsSectionActions
         isCreatingFolder={isCreatingFolder}
@@ -1047,7 +1045,6 @@ function TopLevelSidebarSection({
           "rounded-md pr-1 transition-colors",
           dragBindings && !dragBindings.disabled && "select-none",
         )}
-        title={label}
         onClick={collapseControl ? handleSectionLabelClick : undefined}
         {...dragBindings?.attributes}
         {...(dragBindings?.listeners ?? {})}
@@ -1062,41 +1059,32 @@ function TopLevelSidebarSection({
           {/* Reserve room for up to four section action buttons on the right;
               coarse pointers need a little more. */}
           {collapseControl ? (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  aria-expanded={!collapseControl.isCollapsed}
-                  aria-label={
-                    collapseControl.isCollapsed
-                      ? `Expand ${label} section`
-                      : `Collapse ${label} section`
-                  }
-                  title={undefined}
-                  className={cn(
-                    !collapseControl.isCollapsed && SIDEBAR_HOVER_ACTIONS_CLASS,
-                    "relative z-20 inline-flex size-5 shrink-0 items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:text-sidebar-foreground focus-visible:ring-2",
-                  )}
-                  onClick={handleCollapseControlClick}
-                  onPointerDown={stopCollapseControlPointerDown}
-                  onKeyDown={stopCollapseControlKeyDown}
-                >
-                  <Icon
-                    name="ChevronRight"
-                    className={cn(
-                      "size-3 transition-transform duration-150",
-                      !collapseControl.isCollapsed && "rotate-90",
-                    )}
-                    aria-hidden="true"
-                  />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom">
-                {collapseControl.isCollapsed
-                  ? `Expand ${label}`
-                  : `Collapse ${label}`}
-              </TooltipContent>
-            </Tooltip>
+            <button
+              type="button"
+              aria-expanded={!collapseControl.isCollapsed}
+              aria-label={
+                collapseControl.isCollapsed
+                  ? `Expand ${label} section`
+                  : `Collapse ${label} section`
+              }
+              title={undefined}
+              className={cn(
+                !collapseControl.isCollapsed && SIDEBAR_HOVER_ACTIONS_CLASS,
+                "relative z-20 inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
+              )}
+              onClick={handleCollapseControlClick}
+              onPointerDown={stopCollapseControlPointerDown}
+              onKeyDown={stopCollapseControlKeyDown}
+            >
+              <Icon
+                name="ChevronRight"
+                className={cn(
+                  "size-3 transition-transform duration-150",
+                  !collapseControl.isCollapsed && "rotate-90",
+                )}
+                aria-hidden="true"
+              />
+            </button>
           ) : null}
         </span>
         {actions ? (
@@ -1156,9 +1144,7 @@ export function ProjectListActionButtons({
   threadSearch,
 }: ProjectListActionButtonsProps) {
   const isNewChatDisabled = !onNewChat;
-  const newChatTitle = isNewChatDisabled ? "Start a new thread" : "New thread";
   const threadSearchShortcut = getSidebarThreadSearchShortcutLabel();
-  const threadSearchTitle = `Search threads - ${threadSearchShortcut}`;
   const handleSearchClose = useCallback(() => {
     if (threadSearch?.query.trim()) {
       threadSearch.onQueryChange("");
@@ -1201,7 +1187,6 @@ export function ProjectListActionButtons({
             aria-label={
               threadSearch.query.trim() ? "Clear search" : "Close search"
             }
-            title={threadSearch.query.trim() ? "Clear search" : "Close search"}
             className={PROJECT_LIST_SEARCH_CLOSE_BUTTON_CLASS}
             onClick={handleSearchClose}
           >
@@ -1217,7 +1202,6 @@ export function ProjectListActionButtons({
             className={cn(PROJECT_LIST_ACTION_BUTTON_CLASS, "flex-1")}
             onClick={onNewChat}
             disabled={isNewChatDisabled}
-            title={newChatTitle}
           >
             <Icon name="MessageSquarePlus" />
             <span className="min-w-0 flex-1 truncate text-left">
@@ -1230,7 +1214,6 @@ export function ProjectListActionButtons({
               size="icon"
               variant="ghost"
               aria-label={`Search threads (${threadSearchShortcut})`}
-              title={threadSearchTitle}
               className={PROJECT_LIST_ACTION_ICON_BUTTON_CLASS}
               onClick={threadSearch.onActivate}
             >
@@ -1250,7 +1233,6 @@ export function ProjectListActionButtons({
           )}
           aria-current={isAutomationsActive ? "page" : undefined}
           onClick={onOpenAutomations}
-          title="Automations"
         >
           <Icon name="Clock" />
           <span className="min-w-0 flex-1 truncate text-left">Automations</span>
@@ -1573,16 +1555,6 @@ function ProjectListComponent({
     },
     [],
   );
-  const handleProjectsViewOptionsOrganizationModeSelect = useCallback(
-    (mode: SidebarOrganizationMode) => {
-      if (mode === "chronological") {
-        setProjectsDisplayOptionsMenuOpen(null);
-        setIsThreadsActionsMenuOpen(false);
-        setThreadsDisplayOptionsMenuOpen("organize");
-      }
-    },
-    [],
-  );
   const [organizationMode] = useAtom(sidebarOrganizationModeAtom);
   const [chronologicalSort, setChronologicalSort] = useAtom(
     sidebarChronologicalSortAtom,
@@ -1971,9 +1943,6 @@ function ProjectListComponent({
       <SidebarDisplayOptionsActions
         open={projectsDisplayOptionsMenuOpen}
         onOpenChange={handleProjectsDisplayOptionsMenuOpenChange}
-        onOrganizationModeSelect={
-          handleProjectsViewOptionsOrganizationModeSelect
-        }
       />
       {onNewProject ? (
         <ProjectListProjectsSectionActions
diff --git a/apps/app/src/components/sidebar/ProjectListProjects.tsx b/apps/app/src/components/sidebar/ProjectListProjects.tsx
index 2d1e5ef62..4ad60da23 100644
--- a/apps/app/src/components/sidebar/ProjectListProjects.tsx
+++ b/apps/app/src/components/sidebar/ProjectListProjects.tsx
@@ -158,8 +158,8 @@ export function ProjectListProjects({
             }
             icon="Folder"
             className="px-2 py-1.5"
-            iconClassName="size-3.5 text-sidebar-foreground/75"
-            messageClassName="text-xs font-medium text-sidebar-foreground/85"
+            iconClassName="size-3.5 text-subtle-foreground/50"
+            messageClassName="text-xs text-subtle-foreground/60"
           />
         </SidebarMenuItem>
       )}
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index 56ac5f2cc..99be6aef7 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -105,8 +105,8 @@ import { sidebarCollapsedFoldersAtom } from "./sidebarCollapsedAtoms";
 import {
   SIDEBAR_PROJECT_GROUP_LINE_CLASS,
   SIDEBAR_ROW_BASE_CLASS,
-  SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
   SIDEBAR_ROW_SELECTED_STATE_CLASS,
+  SIDEBAR_ROW_STATIC_STATE_CLASS,
   getSidebarThreadGroupLineLeft,
   getSidebarThreadRowPaddingLeft,
 } from "./sidebarRowClasses";
@@ -283,9 +283,11 @@ interface ManualThreadTreeDndState {
   enabled: boolean;
   itemIdsByParentKey: ReadonlyMap<string, readonly string[]>;
   onClickCapture: MouseEventHandler<HTMLElement>;
-  // The folder showing an empty drop-placeholder row while a thread is dragged
-  // over it (after a short hover); the dragged row itself carries the title.
-  dragOverFolderKey: string | null;
+  // The drop target showing an empty placeholder row while a thread is dragged
+  // over it (after a short hover): a folder key, or the loose root container id.
+  // The dragged row itself carries the title. One field drives both folder and
+  // loose-list previews so they stay visually identical.
+  dragOverParentKey: string | null;
 }
 
 interface UseManualThreadTreeDndArgs {
@@ -417,11 +419,11 @@ function resolveThreadDropTarget(
   return { activeId, fromParentKey, toParentKey };
 }
 
-// Spring-loaded delay before a hovered folder expands + shows the drop preview.
-// The preview/expand shift layout, so deferring them until the pointer settles
-// keeps dragging *through* a folder (e.g. up out of one's own folder) smooth
-// instead of the inserted row shoving the dragged item back down.
-const FOLDER_DRAG_DWELL_MS = 200;
+// Spring-loaded delay before a hovered drop target shows its placeholder (and a
+// folder expands). The placeholder/expand shift layout, so deferring them until
+// the pointer settles keeps dragging *through* a folder (e.g. up out of one's
+// own folder) smooth instead of the inserted row shoving the dragged item down.
+const DRAG_DWELL_MS = 200;
 
 function useManualThreadTreeDnd({
   containerId,
@@ -437,79 +439,83 @@ function useManualThreadTreeDnd({
   // Whether a thread (vs. nothing droppable) is currently being dragged.
   const draggingThreadRef = useRef(false);
   const dwellTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // The folder the dwell timer is currently counting toward; null when the
-  // pointer isn't over a droppable target folder.
-  const dwellFolderKeyRef = useRef<string | null>(null);
-  // The folder currently showing an (empty) drop-placeholder row, after dwell.
-  const [dragOverFolderKey, setDragOverFolderKey] = useState<string | null>(
+  // The drop target the dwell timer is counting toward (folder key or the loose
+  // root container); null when the pointer isn't over a droppable target.
+  const dwellParentKeyRef = useRef<string | null>(null);
+  // The drop target currently showing an (empty) placeholder row, after dwell:
+  // a folder key, or the loose root container id.
+  const [dragOverParentKey, setDragOverParentKey] = useState<string | null>(
     null,
   );
 
-  const clearFolderDwell = useCallback(() => {
+  const clearDropDwell = useCallback(() => {
     if (dwellTimerRef.current !== null) {
       clearTimeout(dwellTimerRef.current);
       dwellTimerRef.current = null;
     }
-    dwellFolderKeyRef.current = null;
+    dwellParentKeyRef.current = null;
   }, []);
 
-  useEffect(() => clearFolderDwell, [clearFolderDwell]);
+  useEffect(() => clearDropDwell, [clearDropDwell]);
 
   const handleDragStart = useCallback(
     (event: DragStartEvent) => {
       const activeId = event.active.id;
       draggingThreadRef.current =
         typeof activeId === "string" && lookup.threadByItemId.has(activeId);
-      clearFolderDwell();
-      setDragOverFolderKey(null);
+      clearDropDwell();
+      setDragOverParentKey(null);
     },
-    [clearFolderDwell, lookup],
+    [clearDropDwell, lookup],
   );
 
   const handleDragOver = useCallback(
     (event: DragOverEvent) => {
       if (!enabled || !draggingThreadRef.current) return;
       const drop = resolveThreadDropTarget(lookup, event.active, event.over);
-      // Only a real folder (not the loose root) is a spring-load target.
-      const targetFolderKey =
-        drop && drop.toParentKey !== containerId ? drop.toParentKey : null;
+      // The drop target the placeholder will mark: a folder key, or the loose
+      // root container. Null when the pointer isn't over a valid target.
+      const targetParentKey = drop ? drop.toParentKey : null;
 
       // Same target as the in-flight dwell: nothing to do (don't thrash timers
       // on every pointer move).
-      if (targetFolderKey === dwellFolderKeyRef.current) return;
+      if (targetParentKey === dwellParentKeyRef.current) return;
 
-      clearFolderDwell();
-      dwellFolderKeyRef.current = targetFolderKey;
-      setDragOverFolderKey((current) => (current ? null : current));
-      if (targetFolderKey === null) return;
+      clearDropDwell();
+      dwellParentKeyRef.current = targetParentKey;
+      setDragOverParentKey((current) => (current ? null : current));
+      if (targetParentKey === null) return;
 
-      // Spring-loaded: expand a collapsed target and show the empty placeholder
-      // only after the pointer settles, so passing through a folder mid-drag
-      // doesn't shift it under the cursor.
+      // Spring-loaded: reveal the placeholder (and expand a collapsed target
+      // folder) only after the pointer settles, so passing through a folder
+      // mid-drag doesn't shift it under the cursor. The loose root is never
+      // collapsed, so it only gets the placeholder.
       dwellTimerRef.current = setTimeout(() => {
         dwellTimerRef.current = null;
         if (
           !draggingThreadRef.current ||
-          dwellFolderKeyRef.current !== targetFolderKey
+          dwellParentKeyRef.current !== targetParentKey
         ) {
           return;
         }
-        setCollapsedFolders((current) =>
-          current.includes(targetFolderKey)
-            ? current.filter((key) => key !== targetFolderKey)
-            : current,
-        );
-        setDragOverFolderKey(targetFolderKey);
-      }, FOLDER_DRAG_DWELL_MS);
+        if (targetParentKey !== containerId) {
+          setCollapsedFolders((current) =>
+            current.includes(targetParentKey)
+              ? current.filter((key) => key !== targetParentKey)
+              : current,
+          );
+        }
+        setDragOverParentKey(targetParentKey);
+      }, DRAG_DWELL_MS);
     },
-    [clearFolderDwell, containerId, enabled, lookup, setCollapsedFolders],
+    [clearDropDwell, containerId, enabled, lookup, setCollapsedFolders],
   );
 
   const handleDragEnd = useCallback(
     (event: DragEndEvent) => {
       draggingThreadRef.current = false;
-      clearFolderDwell();
-      setDragOverFolderKey(null);
+      clearDropDwell();
+      setDragOverParentKey(null);
       if (!enabled) return;
 
       const drop = resolveThreadDropTarget(lookup, event.active, event.over);
@@ -526,14 +532,14 @@ function useManualThreadTreeDnd({
         folderPath: destinationFolderPath,
       });
     },
-    [clearFolderDwell, enabled, lookup, updateThread],
+    [clearDropDwell, enabled, lookup, updateThread],
   );
 
   const handleDragCancel = useCallback(() => {
     draggingThreadRef.current = false;
-    clearFolderDwell();
-    setDragOverFolderKey(null);
-  }, [clearFolderDwell]);
+    clearDropDwell();
+    setDragOverParentKey(null);
+  }, [clearDropDwell]);
 
   const { consumeClickSuppression, dndContextProps, onClickCapture } =
     useSidebarReorderDnd({
@@ -553,7 +559,7 @@ function useManualThreadTreeDnd({
     enabled,
     itemIdsByParentKey: lookup.itemIdsByParentKey,
     onClickCapture,
-    dragOverFolderKey,
+    dragOverParentKey,
   };
 }
 
@@ -678,15 +684,10 @@ function getProjectThreadTreeEmptyStateClassName(
   );
 }
 
-function getProjectThreadTreeEmptyStateMessageClassName(
-  variant: ProjectThreadTreeVariant,
-): string {
-  return cn(
-    "text-xs leading-4",
-    variant === "project"
-      ? "font-medium text-sidebar-foreground/85"
-      : "text-muted-foreground",
-  );
+function getProjectThreadTreeEmptyStateMessageClassName(): string {
+  // One notch below the section-header label so an empty placeholder never
+  // out-emphasizes the header it sits under.
+  return "text-xs leading-4 text-subtle-foreground/60";
 }
 
 function getProjectThreadTreeGroupLineClassName(
@@ -850,6 +851,9 @@ function ManualSortableList({
   );
 }
 
+// Registers the loose root as a droppable so drops onto its bare/empty area
+// resolve to the loose container. Drop feedback is the inserted placeholder row
+// (see the loose section), matching how folders preview a drop.
 function ManualDroppableParent({
   children,
   className,
@@ -861,20 +865,13 @@ function ManualDroppableParent({
   manualSort?: ManualThreadTreeDndState | null;
   parentKey: string;
 }) {
-  const { isOver, setNodeRef } = useDroppable({
+  const { setNodeRef } = useDroppable({
     id: parentKey,
     disabled: !manualSort?.enabled,
   });
 
   return (
-    <div
-      ref={setNodeRef}
-      className={cn(
-        "rounded-md transition-colors",
-        isOver && "bg-sidebar-accent",
-        className,
-      )}
-    >
+    <div ref={setNodeRef} className={className}>
       {children}
     </div>
   );
@@ -1067,7 +1064,7 @@ function EnvironmentThreadGroupHeaderActions({
             variant="ghost"
             size="icon"
             aria-label="Worktree actions"
-            title="Worktree actions"
+            title={undefined}
             className={cn(
               "rounded-md p-0 text-muted-foreground",
               "data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-foreground",
@@ -1150,7 +1147,7 @@ function EnvironmentThreadGroupHeader({
     stickyLevel === undefined && "relative",
     SIDEBAR_ROW_BASE_CLASS,
     COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
-    "cursor-default",
+    "cursor-pointer",
   );
   const style = {
     paddingLeft: getSidebarThreadRowPaddingLeft(rowDepth),
@@ -1233,7 +1230,6 @@ function EnvironmentThreadGroupHeader({
         level={stickyLevel}
         className={className}
         style={style}
-        title={displayName}
       >
         {content}
       </SidebarStickyTier>
@@ -1241,7 +1237,7 @@ function EnvironmentThreadGroupHeader({
   }
 
   return (
-    <div className={className} style={style} title={displayName}>
+    <div className={className} style={style}>
       {content}
     </div>
   );
@@ -1454,7 +1450,7 @@ export const ThreadTreeItemRow = memo(function ThreadTreeItemRow({
 // Empty drop-slot rendered inside the (auto-expanded) hovered folder so the
 // landing spot is visible. The dragged row itself carries the title (like
 // dragging a queued message), so this placeholder stays intentionally blank.
-export function FolderDropPreviewRow({ depth }: { depth: number }) {
+export function DropPreviewRow({ depth }: { depth: number }) {
   return (
     <div
       aria-hidden="true"
@@ -1506,7 +1502,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
   const stickyLevel =
     depthOffset < SIDEBAR_STICKY_PARENT_DEPTH_CAP ? depthOffset : undefined;
   const folderPath = folder.path.join("/");
-  const showDropPreview = manualSort?.dragOverFolderKey === folderKey;
+  const showDropPreview = manualSort?.dragOverParentKey === folderKey;
   const showChildren = !isCollapsed && folder.items.length > 0;
   // Force the children area open while a thread is dragged over this folder so
   // the empty drop-placeholder row is visible even when the folder is empty.
@@ -1575,7 +1571,7 @@ const FolderTreeItemRow = memo(function FolderTreeItemRow({
             </ManualSortableList>
           ) : null}
           {showDropPreview ? (
-            <FolderDropPreviewRow
+            <DropPreviewRow
               depth={getThreadRowDepth({
                 depthOffset: depthOffset + 1,
                 nodeDepth: 0,
@@ -1853,10 +1849,8 @@ export const ProjectThreadTree = memo(function ProjectThreadTree({
         }
         icon={getProjectThreadTreeEmptyStateIcon(variant)}
         className={getProjectThreadTreeEmptyStateClassName(variant)}
-        iconClassName="size-3.5"
-        messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
-          variant,
-        )}
+        iconClassName="size-3.5 text-subtle-foreground/50"
+        messageClassName={getProjectThreadTreeEmptyStateMessageClassName()}
       />
     );
 
@@ -1944,10 +1938,8 @@ export const ChronologicalThreadTree = memo(function ChronologicalThreadTree({
         }
         icon={getProjectThreadTreeEmptyStateIcon("section")}
         className={getProjectThreadTreeEmptyStateClassName("section")}
-        iconClassName="size-3.5"
-        messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
-          "section",
-        )}
+        iconClassName="size-3.5 text-subtle-foreground/50"
+        messageClassName={getProjectThreadTreeEmptyStateMessageClassName()}
       />
     );
   }
@@ -2048,18 +2040,21 @@ export const ChronologicalFolderThreadSections = memo(
           }
           icon="Folder"
           className={getProjectThreadTreeEmptyStateClassName("section")}
-          iconClassName="size-3.5"
-          messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
-            "section",
-          )}
+          iconClassName="size-3.5 text-subtle-foreground/50"
+          messageClassName={getProjectThreadTreeEmptyStateMessageClassName()}
         />
       );
+    // A thread dragged out of a folder previews its landing in the loose list
+    // with the same inserted placeholder folders use (hiding the empty state so
+    // the placeholder reads as the drop slot when the loose list is empty).
+    const showLoosePreview =
+      manualSort?.dragOverParentKey === CHRONOLOGICAL_CONTAINER_ID;
     const threadsListContent =
       threadListState.status === "loading" ? (
         <ThreadTreeLoadingSkeleton />
       ) : looseItems.length > 0 ? (
         renderItems(looseItems)
-      ) : (
+      ) : showLoosePreview ? null : (
         <EmptyState
           message={
             threadListState.status === "unavailable"
@@ -2068,10 +2063,8 @@ export const ChronologicalFolderThreadSections = memo(
           }
           icon={getProjectThreadTreeEmptyStateIcon("section")}
           className={getProjectThreadTreeEmptyStateClassName("section")}
-          iconClassName="size-3.5"
-          messageClassName={getProjectThreadTreeEmptyStateMessageClassName(
-            "section",
-          )}
+          iconClassName="size-3.5 text-subtle-foreground/50"
+          messageClassName={getProjectThreadTreeEmptyStateMessageClassName()}
         />
       );
     const threadsContent = manualSort?.enabled ? (
@@ -2080,6 +2073,15 @@ export const ChronologicalFolderThreadSections = memo(
         parentKey={CHRONOLOGICAL_CONTAINER_ID}
       >
         {threadsListContent}
+        {showLoosePreview ? (
+          <DropPreviewRow
+            depth={getThreadRowDepth({
+              depthOffset: 0,
+              nodeDepth: 0,
+              variant: "section",
+            })}
+          />
+        ) : null}
       </ManualDroppableParent>
     ) : (
       threadsListContent
@@ -2163,12 +2165,11 @@ function ProjectRowComponent({
               "group/project-row flex w-full items-center rounded-md text-sm transition-colors",
               isActive
                 ? SIDEBAR_ROW_SELECTED_STATE_CLASS
-                : SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
+                : SIDEBAR_ROW_STATIC_STATE_CLASS,
               projectDragBindings &&
                 !projectDragBindings.disabled &&
                 "select-none",
             )}
-            title={project.name}
             onClick={handleProjectRowToggle}
             {...projectDragBindings?.attributes}
             {...(projectDragBindings?.listeners ?? {})}
@@ -2199,34 +2200,26 @@ function ProjectRowComponent({
                 expandLabel={`Expand ${project.name}`}
                 collapseLabel={`Collapse ${project.name}`}
                 onToggle={handleProjectRowToggle}
-                revealOnHover
               />
             </span>
             {isLocalPathInvalid ? (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <NavLink
-                    to={getProjectSettingsRoutePath(project.id)}
-                    onClick={(event) => {
-                      event.stopPropagation();
-                      onProjectSelect?.();
-                    }}
-                    aria-label="Project path not found"
-                    className={cn(
-                      "relative z-10 inline-flex shrink-0 items-center justify-center rounded-md text-destructive outline-none ring-sidebar-ring transition-colors hover:bg-destructive/10 hover:text-destructive focus-visible:ring-2",
-                      COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                    )}
-                  >
-                    <Icon
-                      name="AlertTriangle"
-                      className={COARSE_POINTER_ICON_SIZE_CLASS}
-                    />
-                  </NavLink>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">
-                  Open project settings
-                </TooltipContent>
-              </Tooltip>
+              <NavLink
+                to={getProjectSettingsRoutePath(project.id)}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  onProjectSelect?.();
+                }}
+                aria-label="Project path not found"
+                className={cn(
+                  "relative z-10 inline-flex shrink-0 items-center justify-center rounded-md text-destructive outline-none ring-sidebar-ring transition-colors hover:bg-destructive/10 hover:text-destructive focus-visible:ring-2",
+                  COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                )}
+              >
+                <Icon
+                  name="AlertTriangle"
+                  className={COARSE_POINTER_ICON_SIZE_CLASS}
+                />
+              </NavLink>
             ) : (
               <span
                 data-sidebar-hover-actions-open={
@@ -2236,7 +2229,6 @@ function ProjectRowComponent({
                   SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
                 }
                 className={cn(
-                  SIDEBAR_HOVER_ACTIONS_CLASS,
                   "relative z-10 inline-flex shrink-0 items-center",
                   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
                 )}
@@ -2244,6 +2236,7 @@ function ProjectRowComponent({
                 <ProjectActionsMenu
                   project={project}
                   onOpenChange={setIsDropdownActionsOpen}
+                  hideTriggerTooltip
                   triggerClassName={cn(
                     "relative z-10 text-subtle-foreground hover:bg-transparent hover:text-foreground",
                     COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
diff --git a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
index e375723d1..8d677393f 100644
--- a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
+++ b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
@@ -31,7 +31,7 @@ export function SidebarChildToggleChevron({
       }}
       className={cn(
         revealOnHover ? SIDEBAR_HOVER_ACTIONS_CLASS : "pointer-events-auto",
-        "relative z-10 inline-flex size-5 shrink-0 items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:text-foreground focus-visible:ring-2",
+        "relative z-10 inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
       )}
     >
       <Icon
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
index f566d7e14..ff648acaf 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/lib/thread-activity";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
 import { SidebarFolderRow } from "./SidebarFolderRow";
-import { FolderDropPreviewRow } from "./ProjectRow";
+import { DropPreviewRow } from "./ProjectRow";
 
 export default {
   title: "sidebar/Folder row",
@@ -146,7 +146,15 @@ export function DragInto() {
             onToggleCollapsed={noop}
             isDropTargetActive
           />
-          <FolderDropPreviewRow depth={1} />
+          <DropPreviewRow depth={1} />
+        </SidebarStage>
+      </StoryRow>
+      <StoryRow
+        label="loose-list drop"
+        hint="dragging a thread out of a folder previews the same slot at root depth in the loose Threads list"
+      >
+        <SidebarStage>
+          <DropPreviewRow depth={0} />
         </SidebarStage>
       </StoryRow>
     </StoryCard>
diff --git a/apps/app/src/components/sidebar/SidebarFolderRow.tsx b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
index c55a1780e..42ca67fba 100644
--- a/apps/app/src/components/sidebar/SidebarFolderRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarFolderRow.tsx
@@ -27,7 +27,6 @@ import {
   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
 } from "@/components/ui/coarse-pointer-sizing.js";
 import {
-  SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
   SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE,
@@ -37,7 +36,7 @@ import { cn } from "@/lib/utils";
 import type { CollapsedChildActivity } from "@/lib/thread-activity";
 import {
   SIDEBAR_ROW_BASE_CLASS,
-  SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
+  SIDEBAR_ROW_STATIC_STATE_CLASS,
   getSidebarThreadRowPaddingLeft,
 } from "./sidebarRowClasses";
 import { SidebarChildToggleChevron } from "./SidebarChildToggleChevron";
@@ -87,9 +86,7 @@ function SidebarFolderRowComponent({
   stickyLevel,
 }: SidebarFolderRowProps) {
   const [isActionsOpen, setIsActionsOpen] = useState(false);
-  const hasMenuActions = Boolean(
-    onViewArchivedThreads || onRename || onRemove,
-  );
+  const hasMenuActions = Boolean(onViewArchivedThreads || onRename || onRemove);
   const hasActions = Boolean(onCreateThread || hasMenuActions);
   // Collapsed: the header speaks for its hidden descendants through one glyph
   // (pending > working > unread). Expanded: descendants show their own glyphs.
@@ -101,9 +98,8 @@ function SidebarFolderRowComponent({
     // positioned box. Mirrors ThreadRow / EnvironmentThreadGroupHeader.
     stickyLevel === undefined && "relative",
     SIDEBAR_ROW_BASE_CLASS,
-    SIDEBAR_ROW_INTERACTIVE_STATE_CLASS,
+    SIDEBAR_ROW_STATIC_STATE_CLASS,
     COARSE_POINTER_COMPACT_ROW_HEIGHT_CLASS,
-    "cursor-pointer",
     dragBindings && !dragBindings.disabled && "select-none",
     isDropTargetActive && "bg-sidebar-accent text-sidebar-accent-foreground",
   );
@@ -188,7 +184,6 @@ function SidebarFolderRowComponent({
             SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
           }
           className={cn(
-            SIDEBAR_HOVER_ACTIONS_CLASS,
             "relative z-10 inline-flex shrink-0 items-center",
             SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
           )}
@@ -196,46 +191,46 @@ function SidebarFolderRowComponent({
         >
           {hasMenuActions ? (
             <DropdownMenu onOpenChange={setIsActionsOpen}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <DropdownMenuTrigger asChild>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="icon"
-                      aria-label={`${pathLabel} folder actions`}
-                      title={undefined}
-                      className={cn(
-                        "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
-                        COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-                      )}
-                    >
-                      <Icon
-                        name="MoreHorizontal"
-                        className={COARSE_POINTER_ICON_SIZE_CLASS}
-                      />
-                    </Button>
-                  </DropdownMenuTrigger>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">Folder actions</TooltipContent>
-              </Tooltip>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon"
+                  aria-label={`${pathLabel} folder actions`}
+                  title={undefined}
+                  className={cn(
+                    "rounded-md p-0 text-subtle-foreground hover:bg-transparent hover:text-foreground",
+                    COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
+                  )}
+                >
+                  <Icon
+                    name="MoreHorizontal"
+                    className={COARSE_POINTER_ICON_SIZE_CLASS}
+                  />
+                </Button>
+              </DropdownMenuTrigger>
               <DropdownMenuContent align="end">
                 {onViewArchivedThreads ? (
                   <DropdownMenuItem onSelect={onViewArchivedThreads}>
-                    View archived threads
+                    <Icon name="Archive" aria-hidden="true" />
+                    View archive
                   </DropdownMenuItem>
                 ) : null}
                 {onViewArchivedThreads && (onRename || onRemove) ? (
                   <DropdownMenuSeparator />
                 ) : null}
                 {onRename ? (
-                  <DropdownMenuItem onSelect={onRename}>Rename</DropdownMenuItem>
+                  <DropdownMenuItem onSelect={onRename}>
+                    <Icon name="Edit" aria-hidden="true" />
+                    Rename
+                  </DropdownMenuItem>
                 ) : null}
                 {onRemove ? (
                   <DropdownMenuItem
                     className="text-destructive focus:text-destructive"
                     onSelect={onRemove}
                   >
+                    <Icon name="Trash2" aria-hidden="true" />
                     Remove
                   </DropdownMenuItem>
                 ) : null}
@@ -282,7 +277,6 @@ function SidebarFolderRowComponent({
         level={stickyLevel}
         className={className}
         style={style}
-        title={pathLabel}
         {...dragBindings?.attributes}
         {...(dragBindings?.listeners ?? {})}
         onClickCapture={
@@ -299,7 +293,6 @@ function SidebarFolderRowComponent({
       ref={dragBindings?.setActivatorNodeRef}
       className={className}
       style={style}
-      title={pathLabel}
       {...dragBindings?.attributes}
       {...(dragBindings?.listeners ?? {})}
       onClickCapture={consumeClickSuppression ? handleClickCapture : undefined}
diff --git a/apps/app/src/components/sidebar/SidebarHistoryNavigationControls.tsx b/apps/app/src/components/sidebar/SidebarHistoryNavigationControls.tsx
index ef6b0e527..8eaef32b3 100644
--- a/apps/app/src/components/sidebar/SidebarHistoryNavigationControls.tsx
+++ b/apps/app/src/components/sidebar/SidebarHistoryNavigationControls.tsx
@@ -42,7 +42,6 @@ function SidebarHistoryNavButton({
       onClick={onClick}
       disabled={disabled}
       aria-label={label}
-      title={label}
     >
       <Icon name={icon} aria-hidden />
     </Button>
diff --git a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
index 051d8a6b0..8d79bf68d 100644
--- a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
+++ b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
@@ -32,7 +32,6 @@ interface SidebarThreadSearchPanelProps {
 
 interface ThreadSearchRenderableRow {
   id: string;
-  isArchivedGroup: boolean;
   matches: readonly ThreadSearchMatch[];
   thread: ThreadListEntry;
 }
@@ -136,7 +135,6 @@ function renderSectionRows({
               key={row.id}
               id={item.optionId}
               isActive={activeIndex === index}
-              isArchivedGroup={row.isArchivedGroup}
               matches={row.matches}
               projectName={projectNamesById.get(row.thread.projectId)}
               thread={row.thread}
@@ -171,14 +169,13 @@ export function SidebarThreadSearchPanel({
         .slice(0, RECENT_THREAD_LIMIT)
         .map((thread) => ({
           id: `recent:${thread.id}`,
-          isArchivedGroup: false,
           matches: EMPTY_MATCHES,
           thread,
         }));
       return [
         {
           id: "active",
-          label: "Active",
+          label: "Recent",
           rows,
           total: rows.length,
         },
@@ -189,7 +186,7 @@ export function SidebarThreadSearchPanel({
       return [
         {
           id: "active",
-          label: "Active",
+          label: "Threads",
           rows: [],
           total: 0,
         },
@@ -205,21 +202,19 @@ export function SidebarThreadSearchPanel({
     const activeRows =
       threadSearch.data?.active.results.map((result) => ({
         id: `active:${result.thread.id}`,
-        isArchivedGroup: false,
         matches: result.matches,
         thread: result.thread,
       })) ?? [];
     const archivedRows =
       threadSearch.data?.archived.results.map((result) => ({
         id: `archived:${result.thread.id}`,
-        isArchivedGroup: true,
         matches: result.matches,
         thread: result.thread,
       })) ?? [];
     return [
       {
         id: "active",
-        label: "Active",
+        label: "Threads",
         rows: activeRows,
         total: threadSearch.data?.active.total ?? 0,
       },
diff --git a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
index 335a56c62..0c2c85098 100644
--- a/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarViewOptionsMenu.stories.tsx
@@ -1,14 +1,7 @@
 import { useMemo } from "react";
-import {
-  createStore,
-  Provider as JotaiProvider,
-  useAtomValue,
-} from "jotai";
+import { createStore, Provider as JotaiProvider, useAtomValue } from "jotai";
 import { StoryCard, StoryRow } from "../../../.ladle/story-card";
-import {
-  SidebarOrganizeOptionsMenu,
-  SidebarSortOptionsMenu,
-} from "./ProjectList";
+import { SidebarGroupOptionsMenu, SidebarSortOptionsMenu } from "./ProjectList";
 import {
   sidebarChronologicalSortAtom,
   sidebarOrganizationModeAtom,
@@ -27,7 +20,7 @@ function StateReadout() {
   const direction = useAtomValue(sidebarSortDirectionAtom);
   return (
     <dl className="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs">
-      <dt className="text-muted-foreground">organize</dt>
+      <dt className="text-muted-foreground">group</dt>
       <dd className="font-mono">{organizationMode}</dd>
       <dt className="text-muted-foreground">sort</dt>
       <dd className="font-mono">{sort}</dd>
@@ -54,10 +47,10 @@ function InteractiveMenus() {
       <div className="flex w-72 flex-col gap-4 rounded-md bg-sidebar p-4 text-sidebar-foreground">
         <div className="flex items-center justify-between">
           <span className="text-xs font-medium text-muted-foreground">
-            Threads
+            Projects
           </span>
           <div className="flex items-center gap-1">
-            <SidebarOrganizeOptionsMenu />
+            <SidebarGroupOptionsMenu />
             <SidebarSortOptionsMenu />
           </div>
         </div>
diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index a3e6bc409..2ff148d44 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -128,13 +128,18 @@ function renderThreadRowContainer({
   stickyLevel,
   style,
 }: ThreadRowContainerArgs) {
+  // Draggable rows (the Folders view) show a grab cursor over the whole row.
+  const containerClassName = cn(
+    className,
+    dragBindings && "cursor-grab active:cursor-grabbing",
+  );
   if (stickyLevel !== undefined) {
     return (
       <SidebarStickyTier
         ref={dragBindings?.setActivatorNodeRef}
         tier="parent"
         level={stickyLevel}
-        className={className}
+        className={containerClassName}
         style={style}
         {...dragBindings?.attributes}
         {...(dragBindings?.listeners ?? {})}
@@ -148,7 +153,7 @@ function renderThreadRowContainer({
   return (
     <div
       ref={dragBindings?.setActivatorNodeRef}
-      className={className}
+      className={containerClassName}
       style={style}
       {...dragBindings?.attributes}
       {...(dragBindings?.listeners ?? {})}
@@ -197,11 +202,7 @@ function ThreadSuccessStatusGlyph({ label }: { label: string }) {
   }
 
   return (
-    <span
-      className={SIDEBAR_SUCCESS_STATUS_DOT_CLASS}
-      aria-label={label}
-      title={label}
-    />
+    <span className={SIDEBAR_SUCCESS_STATUS_DOT_CLASS} aria-label={label} />
   );
 }
 
@@ -342,7 +343,6 @@ function ThreadRowComponent({
   const linkLabel = hasComposerDraft
     ? `Open ${labelTitle} (unsubmitted draft)`
     : `Open ${labelTitle}`;
-  const linkTitle = linkLabel;
   const rowDragBindings = options.dragBindings;
   const rowClassName = cn(
     SIDEBAR_HOVER_ACTIONS_ROW_CLASS,
@@ -381,8 +381,12 @@ function ThreadRowComponent({
           onProjectSelect?.();
         }}
         aria-label={linkLabel}
-        title={linkTitle}
-        className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
+        className={cn(
+          "absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2",
+          // Draggable rows (the Folders view) show a grab affordance; the link
+          // still selects on click since a drag needs the activation distance.
+          rowDragBindings && "cursor-grab active:cursor-grabbing",
+        )}
       />
       <span className="flex min-w-0 flex-1 items-center gap-1.5">
         <span className="min-w-0 truncate">{visibleTitle}</span>
diff --git a/apps/app/src/components/sidebar/ThreadSearchResultRow.tsx b/apps/app/src/components/sidebar/ThreadSearchResultRow.tsx
index 30e58b4dc..97c03023b 100644
--- a/apps/app/src/components/sidebar/ThreadSearchResultRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadSearchResultRow.tsx
@@ -9,8 +9,8 @@ import {
 import type { ThreadListEntry } from "@bb/domain";
 import type { ThreadSearchMatch } from "@bb/server-contract";
 import { PERSONAL_PROJECT_ID } from "@bb/domain";
-import { COARSE_POINTER_ICON_SIZE_CLASS } from "@/components/ui/coarse-pointer-sizing.js";
 import { Icon } from "@/components/ui/icon.js";
+import { formatRelativeTime } from "@/lib/relative-time";
 import { isBusyThread } from "@/lib/thread-activity";
 import { getThreadDisplayTitle } from "@/lib/thread-title";
 import { cn } from "@/lib/utils";
@@ -24,7 +24,6 @@ import {
 interface ThreadSearchResultRowProps {
   id: string;
   isActive: boolean;
-  isArchivedGroup: boolean;
   matches: readonly ThreadSearchMatch[];
   onActive: () => void;
   onSelect: () => void;
@@ -105,7 +104,6 @@ function getSnippetMatch(
 function ThreadSearchResultRowComponent({
   id,
   isActive,
-  isArchivedGroup,
   matches,
   onActive,
   onSelect,
@@ -118,10 +116,16 @@ function ThreadSearchResultRowComponent({
   const snippetMatch = getSnippetMatch(matches);
   const hasPendingInteraction = thread.hasPendingInteraction;
   const threadIsBusy = isBusyThread(thread) && !hasPendingInteraction;
-  const metadataParts = [
-    thread.projectId !== PERSONAL_PROJECT_ID ? projectName : undefined,
-    thread.environmentBranchName ?? thread.environmentName ?? undefined,
-  ].filter((part): part is string => part !== undefined && part.length > 0);
+  // For recents and title-only matches, the second line shows the project and
+  // when the thread was last active.
+  const projectMetadata =
+    thread.projectId !== PERSONAL_PROJECT_ID && projectName
+      ? projectName
+      : null;
+  const relativeTime = formatRelativeTime({
+    timestamp: thread.updatedAt,
+    now: Date.now(),
+  });
   const handleMouseEnter = useCallback<
     MouseEventHandler<HTMLButtonElement>
   >(() => {
@@ -153,42 +157,45 @@ function ThreadSearchResultRowComponent({
       onFocus={onActive}
       onClick={onSelect}
     >
-      <span className="mt-0.5 inline-flex size-4 shrink-0 items-center justify-center text-subtle-foreground">
-        {isArchivedGroup ? (
-          <Icon name="Archive" className={COARSE_POINTER_ICON_SIZE_CLASS} />
-        ) : (
-          <Icon
-            name="MessageSquare"
-            className={COARSE_POINTER_ICON_SIZE_CLASS}
-          />
-        )}
-      </span>
       <span className="min-w-0 flex-1 space-y-0.5">
-        <span className="flex min-w-0 items-center gap-1.5">
-          <span className="min-w-0 truncate">
-            <HighlightedText
-              text={title}
-              ranges={titleMatch?.highlightRanges ?? []}
-            />
-          </span>
-          {isArchivedGroup ? (
-            <span className="shrink-0 rounded-sm border border-sidebar-border px-1 py-px text-xs leading-none text-subtle-foreground">
-              Archived
-            </span>
-          ) : null}
+        <span className="block min-w-0 truncate">
+          <HighlightedText
+            text={title}
+            ranges={titleMatch?.highlightRanges ?? []}
+          />
         </span>
         {snippetMatch ? (
-          <span className="block min-w-0 truncate text-xs leading-4 text-muted-foreground">
-            <HighlightedText
-              text={snippetMatch.text}
-              ranges={snippetMatch.highlightRanges}
+          <span className="flex min-w-0 items-start gap-1.5 text-xs leading-4 text-muted-foreground">
+            <Icon
+              name="MessageSquare"
+              className="mt-px size-3 shrink-0 text-subtle-foreground"
+              aria-hidden="true"
             />
+            <span className="line-clamp-2 min-w-0">
+              <HighlightedText
+                text={snippetMatch.text}
+                ranges={snippetMatch.highlightRanges}
+              />
+            </span>
           </span>
-        ) : metadataParts.length > 0 ? (
-          <span className="block min-w-0 truncate text-xs leading-4 text-muted-foreground">
-            {metadataParts.join(" / ")}
+        ) : (
+          <span className="flex min-w-0 items-center gap-1.5 text-xs leading-4 text-muted-foreground">
+            {projectMetadata ? (
+              <>
+                <span className="flex min-w-0 items-center gap-1">
+                  <Icon
+                    name="FolderGit"
+                    className="size-3.5 shrink-0"
+                    aria-hidden="true"
+                  />
+                  <span className="min-w-0 truncate">{projectMetadata}</span>
+                </span>
+                <span className="shrink-0 opacity-60">·</span>
+              </>
+            ) : null}
+            <span className="shrink-0">{relativeTime}</span>
           </span>
-        ) : null}
+        )}
       </span>
       {hasPendingInteraction || threadIsBusy ? (
         <span className="inline-flex size-4 shrink-0 items-center justify-center">
diff --git a/apps/app/src/components/sidebar/sidebarRowClasses.ts b/apps/app/src/components/sidebar/sidebarRowClasses.ts
index 1c8dd5926..6f3cb5ae2 100644
--- a/apps/app/src/components/sidebar/sidebarRowClasses.ts
+++ b/apps/app/src/components/sidebar/sidebarRowClasses.ts
@@ -64,11 +64,18 @@ export function getSidebarThreadGroupLineLeft(depth: number): number {
   );
 }
 
+// Clickable sidebar rows show a pointer cursor by default. Draggable rows
+// (threads in the Folders view) override this with cursor-grab.
 export const SIDEBAR_ROW_INTERACTIVE_STATE_CLASS =
-  "text-sidebar-foreground/85 dark:text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground";
+  "cursor-pointer text-sidebar-foreground/85 dark:text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground";
+
+// Header rows whose caret (not the row body) is the click target: project and
+// folder rows. Text color only — no row-level hover highlight or pointer.
+export const SIDEBAR_ROW_STATIC_STATE_CLASS =
+  "text-sidebar-foreground/85 dark:text-sidebar-foreground";
 
 export const SIDEBAR_ROW_SELECTED_STATE_CLASS =
-  "bg-sidebar-border text-sidebar-foreground";
+  "cursor-pointer bg-sidebar-border/70 text-sidebar-foreground";
 
 /**
  * Hairline that runs through an expanded project's thread list, sitting
diff --git a/apps/app/src/components/thread/ThreadActionsMenu.test.tsx b/apps/app/src/components/thread/ThreadActionsMenu.test.tsx
index bec384ab2..34a83472b 100644
--- a/apps/app/src/components/thread/ThreadActionsMenu.test.tsx
+++ b/apps/app/src/components/thread/ThreadActionsMenu.test.tsx
@@ -54,7 +54,7 @@ async function renderOpenMenu(thread: Thread) {
   );
 
   fireEvent.click(screen.getByRole("button", { name: "Thread actions" }));
-  await screen.findByRole("menuitem", { name: /Mark as / });
+  await screen.findByRole("menuitem", { name: /Mark / });
   expect(onOpenChange).toHaveBeenLastCalledWith(true);
   return onOpenChange;
 }
@@ -67,12 +67,12 @@ describe("ThreadActionsMenu", () => {
 
   it.each([
     {
-      label: "Mark as read",
+      label: "Mark read",
       thread: makeThread(),
       action: mockActions.toggleRead,
     },
     {
-      label: "Mark as unread",
+      label: "Mark unread",
       thread: makeThread({ lastReadAt: 100, latestAttentionAt: 50 }),
       action: mockActions.toggleRead,
     },
diff --git a/apps/app/src/components/thread/ThreadActionsMenu.tsx b/apps/app/src/components/thread/ThreadActionsMenu.tsx
index 94352c28e..c5a85aaf2 100644
--- a/apps/app/src/components/thread/ThreadActionsMenu.tsx
+++ b/apps/app/src/components/thread/ThreadActionsMenu.tsx
@@ -4,15 +4,17 @@ import {
   ContextMenu,
   ContextMenuContent,
   ContextMenuItem,
+  ContextMenuSeparator,
   ContextMenuTrigger,
 } from "@/components/ui/context-menu.js";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu.js";
-import { Icon } from "@/components/ui/icon.js";
+import { Icon, type IconName } from "@/components/ui/icon.js";
 import { Button } from "@/components/ui/button.js";
 import { COARSE_POINTER_ICON_SIZE_CLASS } from "@/components/ui/coarse-pointer-sizing.js";
 import { cn } from "@/lib/utils";
@@ -49,6 +51,7 @@ interface ThreadActionsMenuItemsProps extends ThreadActionsMenuBaseProps {
 interface ThreadActionMenuItemProps {
   children: ReactNode;
   className?: string;
+  icon: IconName;
   onSelect?: (event: Event) => void;
   surface: ThreadActionsMenuSurface;
 }
@@ -56,24 +59,45 @@ interface ThreadActionMenuItemProps {
 function ThreadActionMenuItem({
   children,
   className,
+  icon,
   onSelect,
   surface,
 }: ThreadActionMenuItemProps) {
+  // The menu item base styling sizes/spaces a direct <svg> child, so the Icon
+  // renders inline before the label.
+  const content = (
+    <>
+      <Icon name={icon} aria-hidden="true" />
+      {children}
+    </>
+  );
   if (surface === "context") {
     return (
       <ContextMenuItem className={className} onSelect={onSelect}>
-        {children}
+        {content}
       </ContextMenuItem>
     );
   }
 
   return (
     <DropdownMenuItem className={className} onSelect={onSelect}>
-      {children}
+      {content}
     </DropdownMenuItem>
   );
 }
 
+function ThreadActionMenuSeparator({
+  surface,
+}: {
+  surface: ThreadActionsMenuSurface;
+}) {
+  return surface === "context" ? (
+    <ContextMenuSeparator />
+  ) : (
+    <DropdownMenuSeparator />
+  );
+}
+
 function ThreadActionsMenuItems({
   thread,
   canDelete = true,
@@ -94,25 +118,31 @@ function ThreadActionsMenuItems({
 
   return (
     <>
+      {/* Quick status toggles. */}
       <ThreadActionMenuItem
         surface={surface}
+        icon={isRead ? "Mail" : "MailOpen"}
         onSelect={() => {
           toggleRead(thread);
         }}
       >
-        {isRead ? "Mark as unread" : "Mark as read"}
+        {isRead ? "Mark unread" : "Mark read"}
       </ThreadActionMenuItem>
       <ThreadActionMenuItem
         surface={surface}
+        icon={isPinned ? "PinOff" : "Pin"}
         onSelect={() => {
           togglePin(thread);
         }}
       >
         {isPinned ? "Unpin" : "Pin"}
       </ThreadActionMenuItem>
+      <ThreadActionMenuSeparator surface={surface} />
+      {/* Open + edit. */}
       {sendToPopout !== null ? (
         <ThreadActionMenuItem
           surface={surface}
+          icon="ExternalLink"
           onSelect={() => {
             sendToPopout(thread);
           }}
@@ -122,6 +152,7 @@ function ThreadActionsMenuItems({
       ) : null}
       <ThreadActionMenuItem
         surface={surface}
+        icon="Edit"
         onSelect={() => {
           window.setTimeout(() => {
             requestRename(thread);
@@ -130,8 +161,11 @@ function ThreadActionsMenuItems({
       >
         Rename
       </ThreadActionMenuItem>
+      <ThreadActionMenuSeparator surface={surface} />
+      {/* Lifecycle (archive is reversible; delete is destructive). */}
       <ThreadActionMenuItem
         surface={surface}
+        icon={isArchived ? "ArchiveRestore" : "Archive"}
         onSelect={() => {
           if (isArchived) {
             unarchiveThread(thread);
@@ -145,6 +179,7 @@ function ThreadActionsMenuItems({
       {canDelete ? (
         <ThreadActionMenuItem
           surface={surface}
+          icon="Trash2"
           className="text-destructive focus:text-destructive"
           onSelect={() => {
             window.setTimeout(() => {
@@ -210,10 +245,7 @@ export function ThreadActionsContextMenu({
   return (
     <ContextMenu onOpenChange={onOpenChange}>
       <ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
-      <ContextMenuContent
-        aria-label="Thread actions"
-        className="w-44"
-      >
+      <ContextMenuContent aria-label="Thread actions" className="w-44">
         <ThreadActionsMenuItems
           thread={thread}
           canDelete={canDelete}
diff --git a/apps/app/src/components/thread/timeline/ConversationMessageContent.tsx b/apps/app/src/components/thread/timeline/ConversationMessageContent.tsx
index 46d5e9d2a..7173e0b2c 100644
--- a/apps/app/src/components/thread/timeline/ConversationMessageContent.tsx
+++ b/apps/app/src/components/thread/timeline/ConversationMessageContent.tsx
@@ -389,7 +389,7 @@ function UserConversationMessage({
             />
           </div>
         ) : null}
-        <div className="rounded-xl border border-border-seam bg-surface-recessed px-4 py-2.5 text-sm leading-relaxed text-foreground">
+        <div className="rounded-xl border border-border-seam/30 bg-surface-recessed px-4 py-2.5 text-sm leading-relaxed text-foreground">
           {messageText ? (
             <CollapsibleMessageText
               mentions={mentions}
diff --git a/apps/app/src/components/ui/icon.tsx b/apps/app/src/components/ui/icon.tsx
index dd30eb560..dddc35767 100644
--- a/apps/app/src/components/ui/icon.tsx
+++ b/apps/app/src/components/ui/icon.tsx
@@ -68,12 +68,16 @@ import {
   LayoutTwoColumnIcon,
   LayoutTwoRowIcon,
   LinkSquare02Icon,
+  MailIcon,
+  MailOpenIcon,
   Menu02Icon,
   MessageAdd02Icon,
   MessageQuestionIcon,
   Mic02Icon,
   MoreHorizontalIcon,
   PauseIcon,
+  PinIcon,
+  PinOffIcon,
   PlayIcon,
   PlusMinusSquare01Icon,
   PlusSignIcon,
@@ -168,6 +172,8 @@ const ICON_MAP = {
   ListTodo: CheckListIcon,
   Loading: Loading03Icon,
   Lock: LockIcon,
+  Mail: MailIcon,
+  MailOpen: MailOpenIcon,
   Maximize2: ArrowExpand01Icon,
   MessageQuestion: MessageQuestionIcon,
   MessageSquarePlus: BubbleChatAddIcon,
@@ -181,6 +187,8 @@ const ICON_MAP = {
   PanelRight: SidebarRightIcon,
   Paperclip: AttachmentIcon,
   Pause: PauseIcon,
+  Pin: PinIcon,
+  PinOff: PinOffIcon,
   Play: PlayIcon,
   Plus: PlusSignIcon,
   Repeat: RepeatIcon,
diff --git a/apps/app/src/components/ui/sidebar.tsx b/apps/app/src/components/ui/sidebar.tsx
index 56befee99..14c963a69 100644
--- a/apps/app/src/components/ui/sidebar.tsx
+++ b/apps/app/src/components/ui/sidebar.tsx
@@ -66,7 +66,9 @@ function useOptionalIsSidebarShowing() {
   if (context === null) {
     return null;
   }
-  return context.isCompactViewport ? context.openMobile : context.state === "expanded";
+  return context.isCompactViewport
+    ? context.openMobile
+    : context.state === "expanded";
 }
 
 /**
@@ -153,8 +155,10 @@ const SidebarProvider = React.forwardRef<
       <SidebarContext.Provider value={contextValue}>
         {/* Match the agent message action bar's tooltip timing (300ms open
             delay + Radix's default skip window) so sidebar icon tooltips feel
-            the same instead of flashing instantly on hover. */}
-        <TooltipProvider delayDuration={300}>
+            the same instead of flashing instantly on hover. disableHoverableContent
+            dismisses the tooltip the moment the pointer leaves the trigger, so it
+            never lingers/floats while the mouse moves on. */}
+        <TooltipProvider delayDuration={300} disableHoverableContent>
           <div
             style={
               {

From ed52a2b85bf0bcf66b148ae2d65290b3e44dc25f Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Sat, 20 Jun 2026 04:57:44 -0700
Subject: [PATCH 52/54] Add stories for the thread actions menu and search
 result row

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../sidebar/ThreadSearchResultRow.stories.tsx | 162 ++++++++++++++++++
 .../thread/ThreadActionsMenu.stories.tsx      |  66 +++++++
 2 files changed, 228 insertions(+)
 create mode 100644 apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
 create mode 100644 apps/app/src/components/thread/ThreadActionsMenu.stories.tsx

diff --git a/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx b/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
new file mode 100644
index 000000000..1efe04fc3
--- /dev/null
+++ b/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
@@ -0,0 +1,162 @@
+import type { ReactNode } from "react";
+import { PERSONAL_PROJECT_ID } from "@bb/domain";
+import type { ThreadSearchMatch } from "@bb/server-contract";
+import { makeThreadListEntry } from "../../../.ladle/story-fixtures";
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { getThreadDisplayTitle } from "@/lib/thread-title";
+import { ThreadSearchResultRow } from "./ThreadSearchResultRow";
+
+export default {
+  title: "sidebar/Thread search result",
+};
+
+const noop = () => {};
+const HOUR_MS = 60 * 60 * 1000;
+
+// Highlight the first occurrence of `term` (case-insensitive), mirroring how the
+// server returns highlight ranges for a match.
+function highlight(
+  text: string,
+  term: string,
+): ThreadSearchMatch["highlightRanges"] {
+  const index = text.toLowerCase().indexOf(term.toLowerCase());
+  return index < 0 ? [] : [{ start: index, end: index + term.length }];
+}
+
+function Stage({ children }: { children: ReactNode }) {
+  return (
+    <div className="w-[320px] rounded-md bg-sidebar p-1 text-sidebar-foreground">
+      {children}
+    </div>
+  );
+}
+
+const recentThread = makeThreadListEntry({
+  id: "thr_recent",
+  title: "Refactor the sidebar search panel",
+  titleFallback: "Refactor the sidebar search panel",
+  updatedAt: Date.now() - 2 * HOUR_MS,
+});
+const titleMatchThread = makeThreadListEntry({
+  id: "thr_title",
+  title: "Audit recurring permission failures",
+  titleFallback: "Audit recurring permission failures",
+  updatedAt: Date.now() - 26 * HOUR_MS,
+});
+const messageMatchThread = makeThreadListEntry({
+  id: "thr_message",
+  title: "Worktree cleanup",
+  titleFallback: "Worktree cleanup",
+  updatedAt: Date.now() - 3 * HOUR_MS,
+});
+const personalThread = makeThreadListEntry({
+  id: "thr_personal",
+  projectId: PERSONAL_PROJECT_ID,
+  title: "Plan the offsite",
+  titleFallback: "Plan the offsite",
+  updatedAt: Date.now() - 5 * HOUR_MS,
+});
+
+const messageSnippet =
+  "The permission prompts keep recurring after the worktree is recreated — here is the fix I landed and why it works.";
+
+// The redesigned result row: title-first, with a labeled message snippet when a
+// match comes from the conversation body, and project + relative time otherwise.
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow
+        label="recent (no query)"
+        hint="title + project · relative time"
+      >
+        <Stage>
+          <ThreadSearchResultRow
+            id="row-recent"
+            isActive={false}
+            matches={[]}
+            onActive={noop}
+            onSelect={noop}
+            projectName="bb"
+            thread={recentThread}
+          />
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="title match"
+        hint="matched term highlighted in the title"
+      >
+        <Stage>
+          <ThreadSearchResultRow
+            id="row-title"
+            isActive={false}
+            matches={[
+              {
+                sourceKind: "title",
+                text: getThreadDisplayTitle(titleMatchThread),
+                highlightRanges: highlight(
+                  getThreadDisplayTitle(titleMatchThread),
+                  "permission",
+                ),
+              },
+            ]}
+            onActive={noop}
+            onSelect={noop}
+            projectName="bb"
+            thread={titleMatchThread}
+          />
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="message-body match"
+        hint="2-line snippet under a message glyph, matched term highlighted"
+      >
+        <Stage>
+          <ThreadSearchResultRow
+            id="row-message"
+            isActive={false}
+            matches={[
+              {
+                sourceKind: "assistant_message",
+                text: messageSnippet,
+                highlightRanges: highlight(messageSnippet, "permission"),
+              },
+            ]}
+            onActive={noop}
+            onSelect={noop}
+            projectName="bb"
+            thread={messageMatchThread}
+          />
+        </Stage>
+      </StoryRow>
+      <StoryRow label="personal thread" hint="no project — just relative time">
+        <Stage>
+          <ThreadSearchResultRow
+            id="row-personal"
+            isActive={false}
+            matches={[]}
+            onActive={noop}
+            onSelect={noop}
+            projectName={undefined}
+            thread={personalThread}
+          />
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="active (keyboard-highlighted)"
+        hint="aria-selected row state during arrow-key navigation"
+      >
+        <Stage>
+          <ThreadSearchResultRow
+            id="row-active"
+            isActive
+            matches={[]}
+            onActive={noop}
+            onSelect={noop}
+            projectName="bb"
+            thread={recentThread}
+          />
+        </Stage>
+      </StoryRow>
+    </StoryCard>
+  );
+}
diff --git a/apps/app/src/components/thread/ThreadActionsMenu.stories.tsx b/apps/app/src/components/thread/ThreadActionsMenu.stories.tsx
new file mode 100644
index 000000000..d429bc907
--- /dev/null
+++ b/apps/app/src/components/thread/ThreadActionsMenu.stories.tsx
@@ -0,0 +1,66 @@
+import type { ReactNode } from "react";
+import { makeThreadListEntry } from "../../../.ladle/story-fixtures";
+import { StoryCard, StoryRow } from "../../../.ladle/story-card";
+import { ThreadActionsProvider } from "./ThreadActionsProvider";
+import { ThreadActionsMenu } from "./ThreadActionsMenu";
+
+export default {
+  title: "thread/Thread actions menu",
+};
+
+function Stage({ children }: { children: ReactNode }) {
+  return (
+    <ThreadActionsProvider>
+      <div className="flex w-fit items-center rounded-md bg-sidebar p-2 text-sidebar-foreground">
+        {children}
+      </div>
+    </ThreadActionsProvider>
+  );
+}
+
+// Click the "…" trigger to open the menu. It carries icons and grouping
+// dividers: status toggles (read/pin), open + edit, then lifecycle
+// (archive/delete). The read toggle uses an envelope icon and reflects state.
+export function Overview() {
+  const readThread = makeThreadListEntry({
+    id: "thr_read",
+    lastReadAt: 200,
+    latestAttentionAt: 100,
+  });
+  const unreadPinnedThread = makeThreadListEntry({
+    id: "thr_unread",
+    lastReadAt: 100,
+    latestAttentionAt: 200,
+    pinnedAt: 150,
+  });
+  const archivedThread = makeThreadListEntry({
+    id: "thr_archived",
+    archivedAt: 150,
+  });
+
+  return (
+    <StoryCard>
+      <StoryRow
+        label="read · unpinned"
+        hint="Mark unread · Pin — Rename — Archive · Delete"
+      >
+        <Stage>
+          <ThreadActionsMenu thread={readThread} />
+        </Stage>
+      </StoryRow>
+      <StoryRow
+        label="unread · pinned"
+        hint="read toggle flips to Mark read; Pin flips to Unpin"
+      >
+        <Stage>
+          <ThreadActionsMenu thread={unreadPinnedThread} />
+        </Stage>
+      </StoryRow>
+      <StoryRow label="archived" hint="Archive flips to Unarchive">
+        <Stage>
+          <ThreadActionsMenu thread={archivedThread} />
+        </Stage>
+      </StoryRow>
+    </StoryCard>
+  );
+}

From a7f1f79963d1bbcacf01a15164eaf800ce6cba1f Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Sat, 20 Jun 2026 06:05:28 -0700
Subject: [PATCH 53/54] Add search deep-link, prompt-box polish, and
 corner-radius tweaks

- Deep-link sidebar search results to the matched message: carry the
  matched event sequence through the search contract/DB, and scroll to +
  briefly highlight that message on navigate (useScrollToSearchedMessage).
- Search: one click on the X fully dismisses (clear + close); hide the
  count badge on the Archived section.
- Prompt box: restore hover/open backgrounds on the model + permission
  pickers; drop the lingering native tooltip on the context-window
  indicator and restyle its popover to the menu surface with a usage bar.
- Make the content pane's rounded-left corner visible (paint the sidebar
  wrapper bg-sidebar) and bump the prompt box + stack-card corner radius.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/app/src/app.css                          | 22 +++++
 .../src/components/pickers/OptionPicker.tsx   | 46 ++++-----
 .../promptbox/PromptBoxInternal.tsx           |  2 +-
 .../promptbox/banner/PromptStackCard.tsx      |  2 +-
 .../app/src/components/sidebar/AppSidebar.tsx |  6 ++
 .../src/components/sidebar/ProjectList.tsx    |  8 +-
 .../sidebar/SidebarOverview.stories.tsx       |  3 +
 .../sidebar/SidebarThreadSearchPanel.test.tsx |  1 +
 .../sidebar/SidebarThreadSearchPanel.tsx      | 20 +++-
 .../sidebar/ThreadSearchResultRow.stories.tsx |  2 +
 .../components/sidebar/sidebarThreadSearch.ts |  6 ++
 .../timeline/ThreadContextWindowIndicator.tsx | 32 +++---
 .../thread/timeline/ThreadTimelineRows.tsx    |  6 +-
 .../timeline/useScrollToSearchedMessage.ts    | 98 +++++++++++++++++++
 apps/app/src/components/ui/button.tsx         |  2 +-
 apps/app/src/components/ui/sidebar.tsx        |  9 +-
 packages/db/src/data/threads.ts               |  4 +
 packages/db/test/data/thread-search.test.ts   |  5 +
 packages/server-contract/src/api/threads.ts   |  3 +
 19 files changed, 227 insertions(+), 50 deletions(-)
 create mode 100644 apps/app/src/components/thread/timeline/useScrollToSearchedMessage.ts

diff --git a/apps/app/src/app.css b/apps/app/src/app.css
index 1f74c8639..31d8bd328 100644
--- a/apps/app/src/app.css
+++ b/apps/app/src/app.css
@@ -300,3 +300,25 @@
     transform: scale(1) rotate(90deg);
   }
 }
+
+/* Briefly highlight a conversation message that a sidebar search result
+ * deep-links to, then fade back to transparent. */
+@keyframes bb-search-flash {
+  from {
+    background-color: color-mix(in oklch, var(--ring) 22%, transparent);
+  }
+  to {
+    background-color: transparent;
+  }
+}
+
+.bb-search-flash {
+  border-radius: var(--radius-lg, 0.5rem);
+  animation: bb-search-flash 1.6s ease-out;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .bb-search-flash {
+    animation: none;
+  }
+}
diff --git a/apps/app/src/components/pickers/OptionPicker.tsx b/apps/app/src/components/pickers/OptionPicker.tsx
index d0957b5bf..46ccc81ce 100644
--- a/apps/app/src/components/pickers/OptionPicker.tsx
+++ b/apps/app/src/components/pickers/OptionPicker.tsx
@@ -2,23 +2,25 @@ import type { ComponentType, ReactNode } from "react";
 import { Button } from "@/components/ui/button.js";
 import { Icon } from "@/components/ui/icon.js";
 import { COARSE_POINTER_ICON_SIZE_CLASS } from "@/components/ui/coarse-pointer-sizing.js";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuTrigger } from "@/components/ui/dropdown-menu.js";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu.js";
 import { cn } from "@/lib/utils";
 
 export const OPTION_BASE_CLASS_NAME =
   "h-8 w-fit max-w-full min-w-0 items-center justify-start gap-1 px-1 text-xs leading-tight";
-// `data-[state=open]:hover:bg-transparent` overrides the ghost button variant's
-// compound selector that otherwise paints bg-state-active when the trigger is
-// hovered while the menu is open. Hidden in production by `modal=true` (the
-// overlay blocks the hover), but visible whenever a picker is used non-modally
-// — fixing it on the shared constant keeps every OPTION-styled trigger correct
-// regardless of modal mode.
+// Inline picker triggers keep flat resting chrome (no border/background/shadow
+// so they sit inline with surrounding text) but use the ghost button variant's
+// natural state backgrounds — bg-state-hover on hover and bg-state-active while
+// the menu is open — so they read as interactive affordances.
 export const OPTION_INTERACTIVE_CLASS_NAME =
-  "border-none bg-transparent shadow-none hover:bg-transparent data-[state=open]:bg-transparent data-[state=open]:hover:bg-transparent";
-export const OPTION_CONTENT_CLASS_NAME =
-  "flex min-w-0 items-center gap-1.5";
-export const OPTION_TRIGGER_CONTENT_CLASS_NAME =
-  "contents";
+  "border-none bg-transparent shadow-none";
+export const OPTION_CONTENT_CLASS_NAME = "flex min-w-0 items-center gap-1.5";
+export const OPTION_TRIGGER_CONTENT_CLASS_NAME = "contents";
 export const OPTION_MUTED_CLASS_NAME =
   "text-muted-foreground hover:text-foreground";
 const OPTION_WARNING_TEXT_CLASS_NAME = "text-warning-text";
@@ -114,7 +116,8 @@ export function OptionDisplay({
       )}
     >
       <span className={OPTION_CONTENT_CLASS_NAME}>
-        {leading ?? (BrandIcon ? <BrandIcon className="size-4 shrink-0" /> : null)}
+        {leading ??
+          (BrandIcon ? <BrandIcon className="size-4 shrink-0" /> : null)}
         <span className="sr-only">{label}: </span>
         <span className="min-w-0 truncate" data-promptbox-full-label="">
           {value}
@@ -156,7 +159,8 @@ export function OptionPicker<T extends string>({
     : selectedOption?.tone;
   const selectedIsWarning = selectedTone === "warning";
   const SelectedIcon = selectedOption?.icon;
-  const selectedLabel = displayOverride?.label ?? selectedOption?.label ?? value;
+  const selectedLabel =
+    displayOverride?.label ?? selectedOption?.label ?? value;
   const selectedCompactLabel =
     displayOverride?.compactLabel ?? selectedOption?.compactLabel;
   const selectedDescription =
@@ -165,7 +169,7 @@ export function OptionPicker<T extends string>({
     ? displayOverride.title
     : selectedDescription
       ? `${label}: ${selectedLabel} - ${selectedDescription}`
-    : `${label}: ${selectedLabel}`;
+      : `${label}: ${selectedLabel}`;
 
   // The trigger renders identically whether interactive or disabled — the only
   // difference is the `disabled` button state — so the disabled read-only
@@ -192,18 +196,13 @@ export function OptionPicker<T extends string>({
       )}
     >
       <span className={OPTION_TRIGGER_CONTENT_CLASS_NAME}>
-        {SelectedIcon ? (
-          <SelectedIcon className="size-3.5 shrink-0" />
-        ) : null}
+        {SelectedIcon ? <SelectedIcon className="size-3.5 shrink-0" /> : null}
         {selectedCompactLabel ? (
           <>
             <span className="min-w-0 truncate" data-promptbox-full-label="">
               {selectedLabel}
             </span>
-            <span
-              className="min-w-0 truncate"
-              data-promptbox-compact-label=""
-            >
+            <span className="min-w-0 truncate" data-promptbox-compact-label="">
               {selectedCompactLabel}
             </span>
           </>
@@ -266,7 +265,8 @@ export function OptionPicker<T extends string>({
                   ) : null}
                 </span>
               </span>
-              <Icon name="Check"
+              <Icon
+                name="Check"
                 className={cn(
                   COARSE_POINTER_ICON_SIZE_CLASS,
                   option.value === value ? "opacity-100" : "opacity-0",
diff --git a/apps/app/src/components/promptbox/PromptBoxInternal.tsx b/apps/app/src/components/promptbox/PromptBoxInternal.tsx
index 0c6529961..c8c864331 100644
--- a/apps/app/src/components/promptbox/PromptBoxInternal.tsx
+++ b/apps/app/src/components/promptbox/PromptBoxInternal.tsx
@@ -2265,7 +2265,7 @@ export function PromptBoxInternal({
         emitAttachmentFiles(Array.from(event.dataTransfer.files));
       }}
       className={cn(
-        "relative w-full rounded-lg border border-border bg-background pb-2 shadow-lift",
+        "relative w-full rounded-xl rounded-l-2xl border border-border bg-background pb-2 shadow-lift",
         // Zen toggles only the *height* of the box; the inset padding stays
         // identical so the placeholder/text doesn't jump when toggling.
         // `flex flex-col` lets the editor's `flex-1` fill the dvh height.
diff --git a/apps/app/src/components/promptbox/banner/PromptStackCard.tsx b/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
index 42ce3232b..3eaf745d8 100644
--- a/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
+++ b/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
@@ -2,7 +2,7 @@ import { type CSSProperties, type ReactNode } from "react";
 import { cn } from "@/lib/utils";
 
 const BASE_CHROME =
-  "rounded-md border border-border bg-surface-recessed";
+  "rounded-lg rounded-l-xl border border-border bg-surface-recessed";
 
 export interface PromptStackCardProps {
   children: ReactNode;
diff --git a/apps/app/src/components/sidebar/AppSidebar.tsx b/apps/app/src/components/sidebar/AppSidebar.tsx
index 7f980053d..35b4504f2 100644
--- a/apps/app/src/components/sidebar/AppSidebar.tsx
+++ b/apps/app/src/components/sidebar/AppSidebar.tsx
@@ -128,6 +128,12 @@ export function AppSidebar({
           projectId: item.projectId,
           threadId: item.threadId,
         }),
+        // Hand the matched message's event sequence to the timeline so it can
+        // scroll to and briefly highlight that message. Omitted for title-only
+        // matches, which just open the thread normally.
+        item.messageSeq !== null
+          ? { state: { searchMessageSeq: item.messageSeq } }
+          : undefined,
       );
       closeOnMobile();
     },
diff --git a/apps/app/src/components/sidebar/ProjectList.tsx b/apps/app/src/components/sidebar/ProjectList.tsx
index 374748a09..a8bad3977 100644
--- a/apps/app/src/components/sidebar/ProjectList.tsx
+++ b/apps/app/src/components/sidebar/ProjectList.tsx
@@ -1145,12 +1145,10 @@ export function ProjectListActionButtons({
 }: ProjectListActionButtonsProps) {
   const isNewChatDisabled = !onNewChat;
   const threadSearchShortcut = getSidebarThreadSearchShortcutLabel();
+  // One click on the X fully dismisses search — it clears the query and closes
+  // the input in a single step (onClose resets the query too). Previously this
+  // was a two-step clear-then-close, which felt like the X "needed two presses".
   const handleSearchClose = useCallback(() => {
-    if (threadSearch?.query.trim()) {
-      threadSearch.onQueryChange("");
-      threadSearch.inputRef.current?.focus();
-      return;
-    }
     threadSearch?.onClose();
   }, [threadSearch]);
 
diff --git a/apps/app/src/components/sidebar/SidebarOverview.stories.tsx b/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
index c08fdbd11..0c5f47486 100644
--- a/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
+++ b/apps/app/src/components/sidebar/SidebarOverview.stories.tsx
@@ -220,6 +220,7 @@ const searchResponse = {
             sourceKind: "user_message",
             text: "needle appears in the original request",
             highlightRanges: [{ start: 0, end: 6 }],
+            sourceSeq: 2,
           },
         ],
       },
@@ -236,6 +237,7 @@ const searchResponse = {
             sourceKind: "title",
             text: "Needle follow-up",
             highlightRanges: [{ start: 0, end: 6 }],
+            sourceSeq: null,
           },
         ],
       },
@@ -257,6 +259,7 @@ const searchResponse = {
             sourceKind: "assistant_message",
             text: "The archived thread contains the matching needle.",
             highlightRanges: [{ start: 42, end: 48 }],
+            sourceSeq: 7,
           },
         ],
       },
diff --git a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
index 0bd2053dc..600634160 100644
--- a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
+++ b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.test.tsx
@@ -172,6 +172,7 @@ describe("SidebarThreadSearchPanel", () => {
           optionId,
           projectId: "proj_search",
           threadId: "thr_current",
+          messageSeq: null,
         },
       ]),
     );
diff --git a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
index 8d79bf68d..9c3428236 100644
--- a/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
+++ b/apps/app/src/components/sidebar/SidebarThreadSearchPanel.tsx
@@ -51,6 +51,23 @@ interface ThreadSearchMessageProps {
 
 const RECENT_THREAD_LIMIT = 20;
 const EMPTY_MATCHES: readonly ThreadSearchMatch[] = [];
+const TITLE_MATCH_KINDS = new Set<ThreadSearchMatch["sourceKind"]>([
+  "title",
+  "title_fallback",
+]);
+
+// The message (non-title) match drives the deep-link target. Mirrors the row's
+// snippet selection so clicking a result lands on the message shown in the row.
+function getMessageMatchSeq(
+  matches: readonly ThreadSearchMatch[],
+): number | null {
+  for (const match of matches) {
+    if (!TITLE_MATCH_KINDS.has(match.sourceKind) && match.sourceSeq !== null) {
+      return match.sourceSeq;
+    }
+  }
+  return null;
+}
 
 function toNavigationItem(
   row: ThreadSearchRenderableRow,
@@ -60,6 +77,7 @@ function toNavigationItem(
     optionId: getSidebarThreadSearchOptionId(row.id),
     projectId: row.thread.projectId,
     threadId: row.thread.id,
+    messageSeq: getMessageMatchSeq(row.matches),
   };
 }
 
@@ -120,7 +138,7 @@ function renderSectionRows({
         )}
       >
         <span className="min-w-0 truncate">{section.label}</span>
-        {section.total > section.rows.length ? (
+        {section.id !== "archived" && section.total > section.rows.length ? (
           <span className="ml-auto shrink-0 text-xs text-muted-foreground">
             {section.rows.length}/{section.total}
           </span>
diff --git a/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx b/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
index 1efe04fc3..8eb787c04 100644
--- a/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
+++ b/apps/app/src/components/sidebar/ThreadSearchResultRow.stories.tsx
@@ -97,6 +97,7 @@ export function Overview() {
                   getThreadDisplayTitle(titleMatchThread),
                   "permission",
                 ),
+                sourceSeq: null,
               },
             ]}
             onActive={noop}
@@ -119,6 +120,7 @@ export function Overview() {
                 sourceKind: "assistant_message",
                 text: messageSnippet,
                 highlightRanges: highlight(messageSnippet, "permission"),
+                sourceSeq: 5,
               },
             ]}
             onActive={noop}
diff --git a/apps/app/src/components/sidebar/sidebarThreadSearch.ts b/apps/app/src/components/sidebar/sidebarThreadSearch.ts
index 521516595..8ec7a8685 100644
--- a/apps/app/src/components/sidebar/sidebarThreadSearch.ts
+++ b/apps/app/src/components/sidebar/sidebarThreadSearch.ts
@@ -8,6 +8,12 @@ export interface SidebarThreadSearchNavigationItem {
   optionId: string;
   projectId: string;
   threadId: string;
+  /**
+   * Event sequence of the matched message, so selecting the result can scroll
+   * to that message in the thread. Null when the match is a title or the row is
+   * a recent (no-query) entry with no message match.
+   */
+  messageSeq: number | null;
 }
 
 export interface SidebarThreadSearchInputController {
diff --git a/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
index f8e3e812a..227adcc35 100644
--- a/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
+++ b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
@@ -36,9 +36,6 @@ export function ThreadContextWindowIndicator({
 
   const usedTokensLabel = formatCompactTokenCount(usage.usedTokens);
   const windowTokensLabel = formatCompactTokenCount(usage.modelContextWindow);
-  const title = usage.estimated
-    ? "Estimated context window usage"
-    : "Context window usage";
 
   return (
     <Popover open={open} onOpenChange={handleOpenChange}>
@@ -51,7 +48,6 @@ export function ThreadContextWindowIndicator({
             className,
           )}
           aria-label={`Context window ${usedPercent}% used`}
-          title={title}
         >
           <svg
             viewBox="0 0 16 16"
@@ -86,17 +82,25 @@ export function ThreadContextWindowIndicator({
         align="end"
         sideOffset={8}
         {...contentHoverProps}
-        className="w-auto max-w-[240px] border-border bg-surface-scrim px-3 py-2 text-sm shadow-lg backdrop-blur-sm"
+        className="w-56 rounded-md border bg-popover p-2 text-popover-foreground shadow-md"
       >
-        <div className="space-y-1.5">
-          <p className="text-muted-foreground">
-            {usage.estimated ? "Estimated context window:" : "Context window:"}
-          </p>
-          <p className="font-medium">
-            {usedPercent}% used ({leftPercent}% left)
-          </p>
-          <p className="font-medium">
-            {usedTokensLabel} / {windowTokensLabel} tokens used
+        <div className="space-y-2">
+          <div className="flex items-baseline justify-between gap-2 text-xs">
+            <span className="text-muted-foreground">
+              {usage.estimated ? "Estimated context" : "Context window"}
+            </span>
+            <span className={cn("font-medium tabular-nums", toneClass)}>
+              {usedPercent}% used
+            </span>
+          </div>
+          <div className="h-1.5 w-full overflow-hidden rounded-full bg-border">
+            <div
+              className={cn("h-full rounded-full bg-current", toneClass)}
+              style={{ width: `${visualPercent}%` }}
+            />
+          </div>
+          <p className="text-xs tabular-nums text-muted-foreground">
+            {usedTokensLabel} / {windowTokensLabel} tokens · {leftPercent}% left
           </p>
         </div>
       </PopoverContent>
diff --git a/apps/app/src/components/thread/timeline/ThreadTimelineRows.tsx b/apps/app/src/components/thread/timeline/ThreadTimelineRows.tsx
index da3244f6f..7bb547701 100644
--- a/apps/app/src/components/thread/timeline/ThreadTimelineRows.tsx
+++ b/apps/app/src/components/thread/timeline/ThreadTimelineRows.tsx
@@ -83,6 +83,7 @@ import { AutoHeightContainer } from "../../ui/height-transition.js";
 import { Icon, type IconName } from "@/components/ui/icon.js";
 import type { PromptMentionLinkResolver } from "@/components/promptbox/editor/prompt-mention-link";
 import { useBottomAnchoredScroll } from "@/components/ui/bottom-anchored-scroll-body.js";
+import { useScrollToSearchedMessage } from "./useScrollToSearchedMessage.js";
 import {
   joinSignatureParts,
   timelineRowRenderSignature,
@@ -1316,7 +1317,9 @@ function leadingIconForWorkRow(
       return "UserRoundPlus";
     case "workflow":
       // Backgrounded shell commands reuse the workflow row but read as commands.
-      return isBackgroundCommandTaskType(row.taskType) ? "Terminal" : "ListTodo";
+      return isBackgroundCommandTaskType(row.taskType)
+        ? "Terminal"
+        : "ListTodo";
     case "approval":
       return "Lock";
     case "question":
@@ -1693,6 +1696,7 @@ function ThreadTimelineRowsForTimelineView(props: ThreadTimelineRowsProps) {
     () => getViewRows(props.timelineRows),
     [getViewRows, props.timelineRows],
   );
+  useScrollToSearchedMessage(rows);
   const scopeActive = isRunningThreadRuntimeDisplayStatus(
     props.threadRuntimeDisplayStatus,
   );
diff --git a/apps/app/src/components/thread/timeline/useScrollToSearchedMessage.ts b/apps/app/src/components/thread/timeline/useScrollToSearchedMessage.ts
new file mode 100644
index 000000000..dd5378c9d
--- /dev/null
+++ b/apps/app/src/components/thread/timeline/useScrollToSearchedMessage.ts
@@ -0,0 +1,98 @@
+import { useEffect, useRef } from "react";
+import { useLocation } from "react-router-dom";
+import { useBottomAnchoredScroll } from "@/components/ui/bottom-anchored-scroll-body.js";
+
+// Structural subset of a timeline view row — every row carries an event-sequence
+// range, which is how we map a searched message's sequence to its rendered row.
+interface SeqAnchoredRow {
+  id: string;
+  sourceSeqStart: number;
+  sourceSeqEnd: number;
+}
+
+const FLASH_CLASS_NAME = "bb-search-flash";
+const FLASH_DURATION_MS = 1700;
+
+// Sidebar search hands the matched message's event sequence to the thread route
+// via `navigate(path, { state: { searchMessageSeq } })`.
+function readSearchMessageSeq(state: unknown): number | null {
+  if (
+    state !== null &&
+    typeof state === "object" &&
+    "searchMessageSeq" in state
+  ) {
+    const value = (state as { searchMessageSeq: unknown }).searchMessageSeq;
+    return typeof value === "number" ? value : null;
+  }
+  return null;
+}
+
+/**
+ * When the thread was opened from a sidebar search result whose match was in a
+ * message body, scroll that message into view and briefly highlight it.
+ *
+ * Keyed off `location.key` so it fires once per navigation (not on every render
+ * or row update). The effect also depends on `rows`, so if the timeline hasn't
+ * hydrated the target row yet it simply retries once the rows arrive.
+ */
+export function useScrollToSearchedMessage(
+  rows: readonly SeqAnchoredRow[],
+): void {
+  const location = useLocation();
+  const bottomAnchor = useBottomAnchoredScroll();
+  const handledKeyRef = useRef<string | null>(null);
+  const targetSeq = readSearchMessageSeq(location.state);
+
+  useEffect(() => {
+    if (targetSeq === null || handledKeyRef.current === location.key) {
+      return;
+    }
+    const targetRow = rows.find(
+      (row) => row.sourceSeqStart <= targetSeq && targetSeq <= row.sourceSeqEnd,
+    );
+    if (targetRow === undefined) {
+      // Target row not rendered yet (still loading, or inside a collapsed
+      // group). Leave the key unhandled so a later rows change can retry.
+      return;
+    }
+    const selector = `[data-timeline-row-id="${CSS.escape(targetRow.id)}"]`;
+    if (document.querySelector(selector) === null) {
+      return;
+    }
+    handledKeyRef.current = location.key;
+
+    let flashed = false;
+    const revealTarget = () => {
+      const element = document.querySelector<HTMLElement>(selector);
+      if (element === null) {
+        return;
+      }
+      if (bottomAnchor !== null) {
+        // scrollElementIntoView suppresses stick-to-bottom so this wins over the
+        // default open-at-bottom behavior.
+        bottomAnchor.scrollElementIntoView({
+          element,
+          options: { block: "center" },
+        });
+      } else {
+        element.scrollIntoView({ block: "center" });
+      }
+      if (!flashed) {
+        flashed = true;
+        element.classList.add(FLASH_CLASS_NAME);
+        window.setTimeout(() => {
+          element.classList.remove(FLASH_CLASS_NAME);
+        }, FLASH_DURATION_MS);
+      }
+    };
+
+    // Reveal on the next frame, then once more after layout settles, so a late
+    // scroll-anchor restore can't leave the target off-screen.
+    const frame = requestAnimationFrame(revealTarget);
+    const settle = window.setTimeout(revealTarget, 320);
+    return () => {
+      cancelAnimationFrame(frame);
+      window.clearTimeout(settle);
+    };
+  }, [bottomAnchor, location.key, rows, targetSeq]);
+}
diff --git a/apps/app/src/components/ui/button.tsx b/apps/app/src/components/ui/button.tsx
index 03e331537..37d34f8c3 100644
--- a/apps/app/src/components/ui/button.tsx
+++ b/apps/app/src/components/ui/button.tsx
@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+  "inline-flex cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
   {
     variants: {
       variant: {
diff --git a/apps/app/src/components/ui/sidebar.tsx b/apps/app/src/components/ui/sidebar.tsx
index 14c963a69..ffbbfae2c 100644
--- a/apps/app/src/components/ui/sidebar.tsx
+++ b/apps/app/src/components/ui/sidebar.tsx
@@ -168,7 +168,10 @@ const SidebarProvider = React.forwardRef<
               } as React.CSSProperties
             }
             className={cn(
-              "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
+              // The wrapper paints `bg-sidebar` so the content pane's rounded
+              // left corner (SidebarInset's rounded-l-2xl) reveals the sidebar
+              // tone behind it instead of canvas-on-canvas (invisible rounding).
+              "group/sidebar-wrapper flex min-h-svh w-full bg-sidebar",
               className,
             )}
             ref={ref}
@@ -346,7 +349,7 @@ const SidebarInset = React.forwardRef<
     <main
       ref={ref}
       className={cn(
-        "relative flex min-h-svh min-w-0 flex-1 flex-col bg-background",
+        "relative flex min-h-svh min-w-0 flex-1 flex-col overflow-hidden rounded-l-2xl bg-background",
         "peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
         className,
       )}
@@ -632,7 +635,7 @@ const SidebarMenuItem = React.forwardRef<
 SidebarMenuItem.displayName = "SidebarMenuItem";
 
 const sidebarMenuButtonVariants = cva(
-  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-border/70 data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[active=true]:hover:bg-sidebar-border/70 data-[active=true]:hover:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+  "peer/menu-button flex w-full cursor-pointer items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-border/70 data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[active=true]:hover:bg-sidebar-border/70 data-[active=true]:hover:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
   {
     variants: {
       variant: {
diff --git a/packages/db/src/data/threads.ts b/packages/db/src/data/threads.ts
index 6acd2151a..1116508eb 100644
--- a/packages/db/src/data/threads.ts
+++ b/packages/db/src/data/threads.ts
@@ -62,6 +62,9 @@ export interface ThreadSearchMatch {
   sourceKind: ThreadSearchSourceKind;
   text: string;
   highlightRanges: ThreadSearchHighlightRange[];
+  // Event sequence of the matched message (null for title matches), so callers
+  // can deep-link to the message in the conversation timeline.
+  sourceSeq: number | null;
 }
 
 export interface ThreadSearchResult {
@@ -1002,6 +1005,7 @@ function hydrateThreadSearchGroup(
         text: row.text,
         tokens: args.tokens,
       }),
+      sourceSeq: row.sourceSeq,
     });
     matchesByThreadId.set(row.threadId, matches);
   }
diff --git a/packages/db/test/data/thread-search.test.ts b/packages/db/test/data/thread-search.test.ts
index 279f033fa..ced184442 100644
--- a/packages/db/test/data/thread-search.test.ts
+++ b/packages/db/test/data/thread-search.test.ts
@@ -267,6 +267,9 @@ describe("thread search data", () => {
       expect(assistantResults.active.results[0]?.matches[0]).toMatchObject({
         sourceKind: "assistant_message",
         text: "assistantwriterneedle",
+        // Message matches carry their event sequence so the UI can deep-link to
+        // the matched message in the conversation.
+        sourceSeq: expect.any(Number),
       });
 
       const archivedResults = searchThreadsWithPendingInteractionState(db, {
@@ -386,6 +389,8 @@ describe("thread search data", () => {
       expect(results.active.results[0]?.matches[0]).toMatchObject({
         text: "café planning",
         highlightRanges: [{ start: 0, end: 4 }],
+        // Title matches have no message to anchor a deep-link to.
+        sourceSeq: null,
       });
     } finally {
       closeConnection(db);
diff --git a/packages/server-contract/src/api/threads.ts b/packages/server-contract/src/api/threads.ts
index 054ce0e3c..5f8322efa 100644
--- a/packages/server-contract/src/api/threads.ts
+++ b/packages/server-contract/src/api/threads.ts
@@ -219,6 +219,9 @@ export const threadSearchMatchSchema = z
     sourceKind: threadSearchSourceKindSchema,
     text: z.string(),
     highlightRanges: z.array(threadSearchHighlightRangeSchema),
+    // Event sequence of the message this match came from, so the UI can deep-link
+    // to it in the conversation. Null for title/title_fallback matches.
+    sourceSeq: z.number().int().nonnegative().nullable(),
   })
   .strict();
 export type ThreadSearchMatch = z.infer<typeof threadSearchMatchSchema>;

From c5de1cc88c191d89feb8a0ce5ddcbaf0aa9ba55a Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Sat, 20 Jun 2026 06:41:01 -0700
Subject: [PATCH 54/54] Polish prompt-box banner and warm the composer cache on
 thread switch

- Banner cards (queued, goal, todo, workflow, prompt-mode, background
  commands): make the whole header row the toggle target and pin the caret
  flush right; queued's caret moves out from beside the count.
- Add a subtle drop shadow to the prompt-box banner chrome (PromptStackCard).
- Context-window menu: right-align the token line's "% left"; add a
  ThreadContextWindowIndicator story (ring tones + open usage-bar menus) via a
  story-only defaultOpen hatch.
- Keep the composer-bootstrap cache warm for 5min (was 30s gcTime) so the
  expanded queued drawer renders from cache on rapid thread switches instead of
  reloading once its gate's cache was evicted.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../promptbox/banner/PromptStackCard.tsx      |  2 +-
 .../promptbox/banner/QueuedMessagesList.tsx   |  2 +-
 .../banner/ThreadBackgroundCommandsCard.tsx   | 14 ++--
 .../promptbox/banner/ThreadGoalCard.tsx       |  4 +-
 .../promptbox/banner/ThreadPromptModeCard.tsx |  4 +-
 .../promptbox/banner/ThreadTodoCard.tsx       |  4 +-
 .../promptbox/banner/ThreadWorkflowCard.tsx   |  4 +-
 .../ThreadContextWindowIndicator.stories.tsx  | 74 +++++++++++++++++++
 .../timeline/ThreadContextWindowIndicator.tsx | 21 ++++--
 .../thread-composer-bootstrap-query.ts        | 11 ++-
 10 files changed, 118 insertions(+), 22 deletions(-)
 create mode 100644 apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.stories.tsx

diff --git a/apps/app/src/components/promptbox/banner/PromptStackCard.tsx b/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
index 3eaf745d8..5cbce0ff5 100644
--- a/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
+++ b/apps/app/src/components/promptbox/banner/PromptStackCard.tsx
@@ -2,7 +2,7 @@ import { type CSSProperties, type ReactNode } from "react";
 import { cn } from "@/lib/utils";
 
 const BASE_CHROME =
-  "rounded-lg rounded-l-xl border border-border bg-surface-recessed";
+  "rounded-lg rounded-l-xl border border-border bg-surface-recessed shadow-sm";
 
 export interface PromptStackCardProps {
   children: ReactNode;
diff --git a/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx b/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
index 91ed549ee..8e9a82a45 100644
--- a/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
+++ b/apps/app/src/components/promptbox/banner/QueuedMessagesList.tsx
@@ -452,7 +452,7 @@ export function QueuedMessagesList({
           <Icon
             name="ChevronDown"
             className={cn(
-              "size-3.5 shrink-0 text-subtle-foreground transition-transform duration-200",
+              "ml-auto size-3.5 shrink-0 text-subtle-foreground transition-transform duration-200",
               isExpanded && "rotate-180",
             )}
             aria-hidden="true"
diff --git a/apps/app/src/components/promptbox/banner/ThreadBackgroundCommandsCard.tsx b/apps/app/src/components/promptbox/banner/ThreadBackgroundCommandsCard.tsx
index e111f071c..13b4f621c 100644
--- a/apps/app/src/components/promptbox/banner/ThreadBackgroundCommandsCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadBackgroundCommandsCard.tsx
@@ -41,7 +41,9 @@ function CommandSummary({
       {/* Verb + description truncate as one unit so the trailing controls
           ("+N more", chevron, duration) never get pushed off a narrow banner. */}
       <span className="min-w-0 truncate" title={row.description}>
-        <span className="text-muted-foreground">Running background command: </span>
+        <span className="text-muted-foreground">
+          Running background command:{" "}
+        </span>
         <span className="font-medium text-foreground opacity-70">
           {row.description}
         </span>
@@ -87,7 +89,7 @@ export function ThreadBackgroundCommandsCard({
       className="overflow-hidden"
       style={{ minHeight: CARD_ROW_HEIGHT }}
     >
-      <div className="flex items-center gap-1.5 px-2 py-1">
+      <div className="flex items-center">
         {hasMore ? (
           <button
             type="button"
@@ -96,7 +98,7 @@ export function ThreadBackgroundCommandsCard({
             aria-controls={BODY_ID}
             aria-label={`Background commands: ${primary.description}`}
             onClick={onToggle}
-            className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+            className="flex w-full min-w-0 items-center gap-1.5 rounded px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-state-hover"
           >
             <Icon
               name="Terminal"
@@ -118,7 +120,7 @@ export function ThreadBackgroundCommandsCard({
           </button>
         ) : (
           <div
-            className="flex min-w-0 flex-1 items-center gap-1.5 px-1 py-0.5 text-xs text-foreground"
+            className="flex w-full min-w-0 items-center gap-1.5 px-3 py-1.5 text-xs text-foreground"
             aria-label={`Background command: ${primary.description}`}
           >
             <Icon
@@ -148,8 +150,8 @@ export function ThreadBackgroundCommandsCard({
               {others.map((row) => (
                 <div
                   key={row.id}
-                  // px-3 (not px-2) so the icon lines up under the header icon,
-                  // which is offset by the toggle button's own px-1 padding.
+                  // px-3 matches the full-width header row's padding so the
+                  // icon lines up under the header icon.
                   className="flex min-w-0 items-center gap-1.5 px-3 py-0.5 text-xs"
                 >
                   <Icon
diff --git a/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx b/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
index 6206b104d..0f80d59fb 100644
--- a/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadGoalCard.tsx
@@ -60,7 +60,7 @@ export function ThreadGoalCard({
       className="overflow-hidden"
       style={{ minHeight: GOAL_CARD_ROW_HEIGHT }}
     >
-      <div className="flex items-center gap-1.5 px-2 py-1">
+      <div className="flex items-center">
         <button
           type="button"
           id={TOGGLE_ID}
@@ -68,7 +68,7 @@ export function ThreadGoalCard({
           aria-controls={BODY_ID}
           aria-label="Goal"
           onClick={onToggle}
-          className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+          className="flex w-full min-w-0 items-center gap-1.5 rounded px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-state-hover"
         >
           <Icon
             name="Target"
diff --git a/apps/app/src/components/promptbox/banner/ThreadPromptModeCard.tsx b/apps/app/src/components/promptbox/banner/ThreadPromptModeCard.tsx
index c798f4ce3..6b929940a 100644
--- a/apps/app/src/components/promptbox/banner/ThreadPromptModeCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadPromptModeCard.tsx
@@ -33,7 +33,7 @@ export function ThreadPromptModeCard({
       className="overflow-hidden"
       style={{ minHeight: PROMPT_MODE_CARD_ROW_HEIGHT }}
     >
-      <div className="flex items-center gap-1.5 px-2 py-1">
+      <div className="flex items-center">
         <button
           type="button"
           id={TOGGLE_ID}
@@ -41,7 +41,7 @@ export function ThreadPromptModeCard({
           aria-controls={BODY_ID}
           aria-label="Plan"
           onClick={onToggle}
-          className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+          className="flex w-full min-w-0 items-center gap-1.5 rounded px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-state-hover"
         >
           <Icon
             name="ListTodo"
diff --git a/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx b/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx
index 3e17d925b..18599c265 100644
--- a/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadTodoCard.tsx
@@ -124,7 +124,7 @@ export function ThreadTodoCard({
       className="overflow-hidden"
       style={{ minHeight: TODO_CARD_ROW_HEIGHT }}
     >
-      <div className="flex items-center gap-1.5 px-2 py-1">
+      <div className="flex items-center">
         <button
           type="button"
           id={TOGGLE_ID}
@@ -132,7 +132,7 @@ export function ThreadTodoCard({
           aria-controls={BODY_ID}
           aria-label={`To-do list: ${summary.aria}`}
           onClick={onToggle}
-          className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+          className="flex w-full min-w-0 items-center gap-1.5 rounded px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-state-hover"
         >
           <Icon
             name="ListTodo"
diff --git a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
index d95a395ff..2f26ea9d4 100644
--- a/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
+++ b/apps/app/src/components/promptbox/banner/ThreadWorkflowCard.tsx
@@ -75,7 +75,7 @@ export function ThreadWorkflowCard({
       className="overflow-hidden"
       style={{ minHeight: WORKFLOW_CARD_ROW_HEIGHT }}
     >
-      <div className="flex items-center gap-1.5 px-2 py-1">
+      <div className="flex items-center">
         <button
           type="button"
           id={TOGGLE_ID}
@@ -83,7 +83,7 @@ export function ThreadWorkflowCard({
           aria-controls={BODY_ID}
           aria-label={`Workflow: ${name}`}
           onClick={onToggle}
-          className="flex min-w-0 flex-1 items-center gap-1.5 rounded px-1 py-0.5 text-xs text-foreground transition-colors hover:bg-state-hover"
+          className="flex w-full min-w-0 items-center gap-1.5 rounded px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-state-hover"
         >
           <Icon
             name="Workflow"
diff --git a/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.stories.tsx b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.stories.tsx
new file mode 100644
index 000000000..1df8a143a
--- /dev/null
+++ b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.stories.tsx
@@ -0,0 +1,74 @@
+import type { ThreadContextWindowUsage } from "@bb/server-contract";
+import { StoryCard, StoryRow } from "../../../../.ladle/story-card";
+import { ThreadContextWindowIndicator } from "./ThreadContextWindowIndicator";
+
+export default {
+  title: "thread/timeline/Context window indicator",
+};
+
+const WINDOW = 200_000;
+
+function usage(
+  usedTokens: number,
+  estimated = false,
+): ThreadContextWindowUsage {
+  return { usedTokens, modelContextWindow: WINDOW, estimated };
+}
+
+// Tone thresholds (shared by the ring stroke and the menu bar/percentage):
+//   < 75%  → muted, 75–89% → warning, ≥ 90% → destructive.
+const low = usage(36_000); // 18% — muted
+const moderate = usage(110_000); // 55% — muted
+const approachingLimit = usage(166_000); // 83% — warning
+const critical = usage(192_000); // 96% — destructive
+const estimated = usage(150_000, true); // 75% — warning, "Estimated" label
+
+// The ring trigger across fill levels. Hover any ring to open the usage menu
+// (see the `UsageMenu` stories for the menu rendered open).
+export function Overview() {
+  return (
+    <StoryCard>
+      <StoryRow label="Low (18%)" hint="muted ring — hover for the usage menu">
+        <ThreadContextWindowIndicator usage={low} />
+      </StoryRow>
+      <StoryRow label="Moderate (55%)" hint="muted ring">
+        <ThreadContextWindowIndicator usage={moderate} />
+      </StoryRow>
+      <StoryRow label="Approaching limit (83%)" hint="warning tone">
+        <ThreadContextWindowIndicator usage={approachingLimit} />
+      </StoryRow>
+      <StoryRow label="Critical (96%)" hint="destructive tone">
+        <ThreadContextWindowIndicator usage={critical} />
+      </StoryRow>
+      <StoryRow
+        label="Estimated (75%)"
+        hint='menu label reads "Estimated context"'
+      >
+        <ThreadContextWindowIndicator usage={estimated} />
+      </StoryRow>
+    </StoryCard>
+  );
+}
+
+// The usage menu opened (normally hover-triggered): a labeled header, a tone-
+// colored usage bar, and the token / remaining line. Bottom-aligned with room
+// above because the popover anchors to the top of the trigger.
+function MenuStage({ usage: u }: { usage: ThreadContextWindowUsage }) {
+  return (
+    <div className="flex min-h-[220px] items-end justify-center p-10">
+      <ThreadContextWindowIndicator usage={u} defaultOpen />
+    </div>
+  );
+}
+
+export function UsageMenu() {
+  return <MenuStage usage={approachingLimit} />;
+}
+
+export function UsageMenuCritical() {
+  return <MenuStage usage={critical} />;
+}
+
+export function UsageMenuEstimated() {
+  return <MenuStage usage={estimated} />;
+}
diff --git a/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
index 227adcc35..b5d1ab368 100644
--- a/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
+++ b/apps/app/src/components/thread/timeline/ThreadContextWindowIndicator.tsx
@@ -10,14 +10,22 @@ import {
 export interface ThreadContextWindowIndicatorProps {
   usage: ThreadContextWindowUsage;
   className?: string;
+  /** Render with the usage menu open on mount. Story-only escape hatch. */
+  defaultOpen?: boolean;
 }
 
 export function ThreadContextWindowIndicator({
   usage,
   className,
+  defaultOpen,
 }: ThreadContextWindowIndicatorProps) {
-  const { open, triggerHoverProps, contentHoverProps, handleOpenChange } =
-    useHoverPopover();
+  const {
+    open: hoverOpen,
+    triggerHoverProps,
+    contentHoverProps,
+    handleOpenChange,
+  } = useHoverPopover();
+  const open = defaultOpen || hoverOpen;
 
   const usedPercent = calculateContextWindowUsagePercent(usage);
   const leftPercent = Math.max(0, 100 - usedPercent);
@@ -99,9 +107,12 @@ export function ThreadContextWindowIndicator({
               style={{ width: `${visualPercent}%` }}
             />
           </div>
-          <p className="text-xs tabular-nums text-muted-foreground">
-            {usedTokensLabel} / {windowTokensLabel} tokens · {leftPercent}% left
-          </p>
+          <div className="flex items-baseline justify-between gap-2 text-xs tabular-nums text-muted-foreground">
+            <span>
+              {usedTokensLabel} / {windowTokensLabel} tokens
+            </span>
+            <span>{leftPercent}% left</span>
+          </div>
         </div>
       </PopoverContent>
     </Popover>
diff --git a/apps/app/src/hooks/queries/thread-composer-bootstrap-query.ts b/apps/app/src/hooks/queries/thread-composer-bootstrap-query.ts
index 98f49ff7c..cd2b2d123 100644
--- a/apps/app/src/hooks/queries/thread-composer-bootstrap-query.ts
+++ b/apps/app/src/hooks/queries/thread-composer-bootstrap-query.ts
@@ -38,7 +38,16 @@ interface FetchAndHydrateThreadComposerBootstrapArgs {
 }
 
 const THREAD_COMPOSER_BOOTSTRAP_STALE_TIME_MS = 10_000;
-const THREAD_COMPOSER_BOOTSTRAP_GC_TIME_MS = 30_000;
+// Keep the composer bootstrap cached for the same window React Query retains the
+// data it gates (default gcTime, 5 min). This query is the readiness gate for the
+// composer + queued-message drawer (`hasData → ready`), so when its cache is
+// evicted, switching back to a thread drops the gate (`enabled=false`, the queued
+// query id collapses to "") and the expanded drawer empties and reloads after a
+// fresh round-trip. A short eviction window made rapid thread switching — even
+// returning to a just-visited thread — reload the drawer every time. Realtime
+// cache-owner updates plus the staleTime-driven background refetch keep the
+// retained cache fresh, so holding it longer is safe.
+const THREAD_COMPOSER_BOOTSTRAP_GC_TIME_MS = 5 * 60_000;
 
 function requireThreadId(id: string, hookName: string): string {
   return requireEnabledQueryArg({ value: id, hookName, argName: "thread id" });