Skip to content

fix(fork): drop the imports the sidebar extraction left behind #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoahHendrickson merged 2 commits into from
Jul 27, 2026
Merged

fix(fork): drop the imports the sidebar extraction left behind #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a517955
fix(fork): drop the imports the sidebar extraction left behind
NoahHendrickson Jul 27, 2026
4e600b7
docs(fork): record why SidebarV2's import header diverges
NoahHendrickson Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .fork/customizations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,15 @@
AppSidebarLayout. Hanging it off the button would unmount it with the
sidebar and leave a collapsed panel with no way back but the rail.

Moving the chrome out took its imports with it, so SidebarV2.tsx's import
header is deliberately shorter than upstream's: the ./ui/command, ./ui/kbd
and ./ui/menu statements are gone entirely, along with EllipsisIcon, and
upstream still imports and uses all of them. That header is the highest
traffic conflict region in this file during a sync, and the divergence is
intentional rather than a botched resolution — a sync must not restore
those imports to make a conflict go away, because nothing in the fork's
copy references them any more.

The brand moves to the header's trailing edge, where it stops competing
with the toggle for the corner the eye starts at. The search and project
rows are 36px and 12px rather than 32px and 14px so they read as chrome
Expand Down
6 changes: 1 addition & 5 deletions apps/web/src/components/SidebarV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
ClockIcon,
CopyIcon,
GitBranchIcon,
EllipsisIcon,
MessageSquareIcon,
PlusIcon,
ServerIcon,
Expand Down Expand Up @@ -141,7 +140,6 @@ import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
import {
Dialog,
Expand All @@ -153,10 +151,8 @@ import {
DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import { Kbd } from "./ui/kbd";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "./ui/select";
import { SidebarContent, SidebarGroup, SidebarMenuButton, useSidebar } from "./ui/sidebar";
import { SidebarContent, SidebarGroup, useSidebar } from "./ui/sidebar";
import { SidebarChromeFooter, SidebarChromeHeader } from "./sidebar/SidebarChrome";
import { Popover, PopoverPopup, PopoverTrigger } from "./ui/popover";
import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
Expand Down
Loading