Declutter task sidebar and folder picker

Remove the worktree and PR chips from sidebar task items, leaving just the title, status icon, timestamp, and hover actions. In the new-task view, the folder picker now lists only main repos when worktree mode is selected, since the app creates its own worktree checkout anyway.

Generated-By: PostHog Code
Task-Id: 95a9bff0-8006-4988-a47b-46a3b8268410

Author: webjunkie

packages/ui/src/features/folder-picker/FolderPicker.test.tsx

@@ -122,6 +122,7 @@ describe("buildFolderRows", () => {
     name: string;
     recents: RegisteredFolder[];
     all: RegisteredFolder[];
+    mainReposOnly?: boolean;
     expected: Array<{ id: string; isWorktree: boolean; indented: boolean }>;
   }>([
     {
@@ -160,9 +161,29 @@ describe("buildFolderRows", () => {
       all: [wtA, main, standalone],
       expected: [{ id: "other", isWorktree: false, indented: false }],
     },
-  ])("$name", ({ recents, all, expected }) => {
+    {
+      name: "mainReposOnly collapses families to their main clone",
+      recents: [wtB, standalone],
+      all: [wtA, main, wtB, standalone],
+      mainReposOnly: true,
+      expected: [
+        { id: "code", isWorktree: false, indented: false },
+        { id: "other", isWorktree: false, indented: false },
+      ],
+    },
+    {
+      name: "mainReposOnly keeps worktrees without a registered main clone",
+      recents: [wtA],
+      all: [wtA, wtB, standalone],
+      mainReposOnly: true,
+      expected: [
+        { id: "code-a", isWorktree: true, indented: false },
+        { id: "code-b", isWorktree: true, indented: false },
+      ],
+    },
+  ])("$name", ({ recents, all, mainReposOnly, expected }) => {
     expect(
-      buildFolderRows(recents, all).map((row) => ({
+      buildFolderRows(recents, all, mainReposOnly).map((row) => ({
         id: row.folder.id,
         isWorktree: row.isWorktree,
         indented: row.indented,

packages/ui/src/features/folder-picker/FolderPicker.tsx

@@ -45,10 +45,15 @@ interface FolderRow {
  * Groups recent folders into repo families: a recent checkout pulls in its
  * main clone and every registered worktree of the same repo, main first,
  * worktrees indented beneath it. Standalone folders stay single rows.
+ *
+ * With `mainReposOnly`, worktrees whose main clone is in the list are dropped
+ * so only one row per repo remains; worktrees without a registered main stay,
+ * as they are the repo's only selectable entry.
  */
 export function buildFolderRows(
   recentFolders: RegisteredFolder[],
   allFolders: RegisteredFolder[],
+  mainReposOnly = false,
 ): FolderRow[] {
   const familyKey = (f: RegisteredFolder) => f.mainRepoPath ?? f.path;
   const emitted = new Set<string>();
@@ -63,6 +68,7 @@ export function buildFolderRows(
       .filter((f) => f.mainRepoPath)
       .sort((a, b) => a.name.localeCompare(b.name));
     if (main) rows.push({ folder: main, isWorktree: false, indented: false });
+    if (main && mainReposOnly) continue;
     for (const wt of worktrees) {
       rows.push({ folder: wt, isWorktree: true, indented: !!main });
     }
@@ -76,6 +82,8 @@ interface FolderPickerProps {
   placeholder?: string;
   variant?: "compact" | "field";
   anchor?: RefObject<HTMLElement | null>;
+  /** Collapse each repo family to its main clone, hiding worktree rows. */
+  mainReposOnly?: boolean;
 }
 
 export function FolderPicker({
@@ -84,6 +92,7 @@ export function FolderPicker({
   placeholder = "Select folder...",
   variant = "compact",
   anchor,
+  mainReposOnly = false,
 }: FolderPickerProps) {
   const trpcClient = useHostTRPCClient();
   const trpc = useHostTRPC();
@@ -106,8 +115,8 @@ export function FolderPicker({
   const [menuOpen, setMenuOpen] = useState(false);
 
   const folderRows = useMemo(
-    () => buildFolderRows(recentFolders, folders),
-    [recentFolders, folders],
+    () => buildFolderRows(recentFolders, folders, mainReposOnly),
+    [recentFolders, folders, mainReposOnly],
   );
 
   // Current branch per visible row, so the picker answers "what is checked

packages/ui/src/features/sidebar/components/TaskListView.tsx

@@ -12,7 +12,6 @@ import type {
   TaskGroup,
 } from "@posthog/core/sidebar/sidebarData.types";
 import { MenuLabel } from "@posthog/quill";
-import { getFileName } from "@posthog/shared";
 import { builderHog } from "@posthog/ui/assets/hedgehogs";
 import { useFolders } from "@posthog/ui/features/folders/useFolders";
 import { useArchivingTasksStore } from "@posthog/ui/features/sidebar/archivingTasksStore";
@@ -90,32 +89,9 @@ function TaskRow({
   depth?: number;
 }) {
   const workspace = useWorkspace(task.id);
-  const { folders } = useFolders();
   const effectiveMode =
     workspace?.mode ??
     (task.taskRunEnvironment === "cloud" ? "cloud" : undefined);
-
-  // Chip identifying the checkout the task runs in: app-managed worktrees
-  // (worktree mode) and local tasks whose registered folder is itself a
-  // linked worktree of the group's main clone.
-  const worktreeCheckout = useMemo(() => {
-    if (workspace?.worktreePath) {
-      return {
-        name: workspace.worktreeName ?? getFileName(workspace.worktreePath),
-        path: workspace.worktreePath,
-      };
-    }
-    if (workspace?.mode === "local" && workspace.folderPath) {
-      const folder = folders.find((f) => f.path === workspace.folderPath);
-      if (folder?.mainRepoPath) {
-        return {
-          name: getFileName(workspace.folderPath),
-          path: workspace.folderPath,
-        };
-      }
-    }
-    return null;
-  }, [workspace, folders]);
   const { prState, hasDiff } = useTaskPrStatus(task);
   const isArchiving = useArchivingTasksStore((s) =>
     s.archivingTaskIds.has(task.id),
@@ -132,8 +108,6 @@ function TaskRow({
       hideHoverActions={hideHoverActions}
       isEditing={isEditing}
       workspaceMode={effectiveMode}
-      worktreeName={worktreeCheckout?.name}
-      worktreePath={worktreeCheckout?.path}
       isSuspended={task.isSuspended}
       isGenerating={task.isGenerating}
       isUnread={task.isUnread}
@@ -144,7 +118,6 @@ function TaskRow({
       slackThreadUrl={task.slackThreadUrl}
       prState={prState}
       hasDiff={hasDiff}
-      prUrl={task.cloudPrUrl}
       timestamp={timestamp}
       onClick={onClick}
       onDoubleClick={onDoubleClick}

packages/ui/src/features/sidebar/components/items/TaskItem.tsx

@@ -1,50 +1,15 @@
-import {
-  Archive,
-  GitFork,
-  GitPullRequest,
-  PushPin,
-} from "@phosphor-icons/react";
-import { parseGithubUrl } from "@posthog/git/utils";
+import { Archive, PushPin } from "@phosphor-icons/react";
 import type { WorkspaceMode } from "@posthog/shared";
 import { formatRelativeTimeShort } from "@posthog/shared";
 import type { TaskRunStatus } from "@posthog/shared/domain-types";
-import { navigateToPullRequestView } from "@posthog/ui/router/navigationBridge";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { DotsCircleSpinner } from "../../../../primitives/DotsCircleSpinner";
 import { NestedButton } from "../../../../primitives/NestedButton";
 import { Tooltip } from "../../../../primitives/Tooltip";
 import type { SidebarPrState } from "../../useTaskPrStatus";
 import { SidebarItem } from "../SidebarItem";
 import { ICON_SIZE, TaskIcon } from "./TaskIcon";
 
-function PrBadge({ url, number }: { url: string; number: number }) {
-  return (
-    <Tooltip content="Open pull request" side="top">
-      <NestedButton
-        aria-label={`Open pull request #${number}`}
-        className="flex h-4 shrink-0 cursor-pointer items-center gap-0.5 rounded bg-gray-3 px-1 text-[11px] text-gray-11 transition-colors hover:bg-gray-4 hover:text-gray-12"
-        onActivate={() => {
-          navigateToPullRequestView(url);
-        }}
-      >
-        <GitPullRequest size={10} weight="bold" />
-        {`#${number}`}
-      </NestedButton>
-    </Tooltip>
-  );
-}
-
-function WorktreeChip({ name, path }: { name: string; path?: string }) {
-  return (
-    <Tooltip content={path ?? name} side="top">
-      <span className="flex h-4 max-w-[96px] shrink-0 items-center gap-0.5 rounded bg-gray-3 px-1 text-[11px] text-gray-11">
-        <GitFork size={10} weight="bold" className="shrink-0" />
-        <span className="truncate">{name}</span>
-      </span>
-    </Tooltip>
-  );
-}
-
 interface TaskItemProps {
   depth?: number;
   taskId: string;
@@ -55,10 +20,6 @@ interface TaskItemProps {
   isArchiving?: boolean;
   hideHoverActions?: boolean;
   workspaceMode?: WorkspaceMode;
-  /** Checkout name shown as a chip when the task runs in a git worktree. */
-  worktreeName?: string;
-  /** Full path of that checkout, surfaced in the chip's tooltip. */
-  worktreePath?: string;
   isGenerating?: boolean;
   isUnread?: boolean;
   isPinned?: boolean;
@@ -69,7 +30,6 @@ interface TaskItemProps {
   slackThreadUrl?: string;
   prState?: SidebarPrState;
   hasDiff?: boolean;
-  prUrl?: string | null;
   timestamp?: number;
   isEditing?: boolean;
   onClick: (e: React.MouseEvent) => void;
@@ -131,8 +91,6 @@ export function TaskItem({
   isArchiving = false,
   hideHoverActions = false,
   workspaceMode,
-  worktreeName,
-  worktreePath,
   isSuspended = false,
   isGenerating,
   isUnread,
@@ -143,7 +101,6 @@ export function TaskItem({
   slackThreadUrl,
   prState,
   hasDiff,
-  prUrl,
   timestamp,
   isEditing = false,
   onClick,
@@ -172,19 +129,11 @@ export function TaskItem({
     />
   );
 
-  const prRef = useMemo(() => (prUrl ? parseGithubUrl(prUrl) : null), [prUrl]);
-  const prBadge =
-    prUrl && prRef?.kind === "pr" ? (
-      <PrBadge url={prUrl} number={prRef.number} />
-    ) : null;
-
-  // The PR badge takes the timestamp's slot, so hide the timestamp when shown.
-  const timestampNode =
-    timestamp && !prBadge ? (
-      <span className="shrink-0 text-[11px] text-gray-11 group-hover:hidden">
-        {formatRelativeTimeShort(timestamp)}
-      </span>
-    ) : null;
+  const timestampNode = timestamp ? (
+    <span className="shrink-0 text-[11px] text-gray-11 group-hover:hidden">
+      {formatRelativeTimeShort(timestamp)}
+    </span>
+  ) : null;
 
   const toolbar =
     !isArchiving && !hideHoverActions && (onArchive || onTogglePin) ? (
@@ -195,15 +144,9 @@ export function TaskItem({
       />
     ) : null;
 
-  const worktreeChip = worktreeName ? (
-    <WorktreeChip name={worktreeName} path={worktreePath} />
-  ) : null;
-
   const endContent =
-    worktreeChip || prBadge || timestampNode || toolbar ? (
+    timestampNode || toolbar ? (
       <>
-        {worktreeChip}
-        {prBadge}
         {timestampNode}
         {toolbar}
       </>

packages/ui/src/features/task-detail/components/TaskInput.tsx

@@ -1127,6 +1127,7 @@ export function TaskInput({
                         onChange={setSelectedDirectory}
                         placeholder="Select repository..."
                         anchor={buttonGroupRef}
+                        mainReposOnly={workspaceMode === "worktree"}
                       />
                     )}
                     <BranchSelector