Skip to content

Consolidate chat header panel controls into overflow menu #192

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
BunsDev merged 2 commits into from
Apr 1, 2026
Merged

Consolidate chat header panel controls into overflow menu #192

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
6e1f647
Consolidate header panel controls into overflow menu
BunsDev Apr 1, 2026
f4a3437
Add project color accents to sidebar and chat header
BunsDev Apr 1, 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
1 change: 1 addition & 0 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4588,6 +4588,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
<ChatHeader
activeThreadId={activeThread.id}
activeThreadTitle={activeThread.title}
activeProjectId={activeProject?.id}
activeProjectName={activeProject?.name}
activeProjectCwd={activeProject?.cwd}
isGitRepo={isGitRepo}
Expand Down
65 changes: 44 additions & 21 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ import {
resolvePackageManagerResolution,
} from "~/projectScriptDefaults";
import { useClientMode } from "~/hooks/useClientMode";
import { getProjectColor } from "~/projectColors";
import type { Thread } from "../types";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
Expand Down Expand Up @@ -1192,7 +1193,16 @@ export default function Sidebar() {
);

return (
<SidebarMenuSubItem key={thread.id} className="w-full" data-thread-item>
<SidebarMenuSubItem key={thread.id} className="relative w-full" data-thread-item>
{/* Project color accent bar */}
<span
aria-hidden="true"
className="absolute bottom-1.5 left-0 top-1.5 w-[3px] rounded-full transition-opacity"
style={{
backgroundColor: pColor.dot,
opacity: isActive ? 1 : 0.35,
}}
/>
<SidebarMenuSubButton
render={<div role="button" tabIndex={0} />}
size="sm"
Expand Down Expand Up @@ -1315,31 +1325,39 @@ export default function Sidebar() {
);
};

const pColor = getProjectColor(project.id);
const isDark = resolvedTheme === "dark";

return (
<Collapsible className="group/collapsible" open={shouldShowThreadPanel}>
<div className="group/project-header relative flex items-center gap-1.5">
<SidebarMenuButton
ref={isManualProjectSorting ? dragHandleProps?.setActivatorNodeRef : undefined}
size="sm"
className={`min-w-0 flex-1 gap-2 rounded-lg border border-transparent px-2.5 py-2.5 text-left ${appSettings.sidebarAccentBgColorOverride ? "" : "bg-accent/40 hover:bg-accent/70 group-hover/project-header:bg-accent/70 dark:bg-accent/30 dark:hover:bg-accent/50 dark:group-hover/project-header:bg-accent/50"} group-hover/project-header:text-sidebar-accent-foreground ${
className={`min-w-0 flex-1 gap-2 rounded-lg border border-transparent px-2.5 py-2.5 text-left ${appSettings.sidebarAccentBgColorOverride ? "" : ""} group-hover/project-header:text-sidebar-accent-foreground ${
isManualProjectSorting ? "cursor-grab active:cursor-grabbing" : "cursor-pointer"
}`}
style={
appSettings.sidebarAccentBgColorOverride
? {
backgroundColor: `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 15%, transparent)`,
}
: undefined
}
style={{
backgroundColor: appSettings.sidebarAccentBgColorOverride
? `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 15%, transparent)`
: isDark
? pColor.bgDark
: pColor.bg,
}}
onMouseEnter={(e) => {
if (appSettings.sidebarAccentBgColorOverride) {
e.currentTarget.style.backgroundColor = `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 25%, transparent)`;
}
const hoverBg = appSettings.sidebarAccentBgColorOverride
? `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 25%, transparent)`
: isDark
? pColor.bgDark.replace("0.12)", "0.20)")
: pColor.bg.replace("0.08)", "0.14)");
e.currentTarget.style.backgroundColor = hoverBg;
}}
onMouseLeave={(e) => {
if (appSettings.sidebarAccentBgColorOverride) {
e.currentTarget.style.backgroundColor = `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 15%, transparent)`;
}
e.currentTarget.style.backgroundColor = appSettings.sidebarAccentBgColorOverride
? `color-mix(in srgb, ${appSettings.sidebarAccentBgColorOverride} 15%, transparent)`
: isDark
? pColor.bgDark
: pColor.bg;
}}
{...(isManualProjectSorting && dragHandleProps ? dragHandleProps.attributes : {})}
{...(isManualProjectSorting && dragHandleProps ? dragHandleProps.listeners : {})}
Expand Down Expand Up @@ -1378,12 +1396,17 @@ export default function Sidebar() {
)}
<ProjectFavicon cwd={project.cwd} />
<span
className={`flex-1 truncate text-[13px] font-semibold tracking-[0.01em] ${appSettings.sidebarAccentProjectNames ? "text-accent-foreground" : "text-foreground"}`}
style={
appSettings.sidebarAccentProjectNames && appSettings.sidebarAccentColorOverride
? { color: appSettings.sidebarAccentColorOverride }
: undefined
}
className="flex-1 truncate text-[13px] font-semibold tracking-[0.01em]"
style={{
color:
appSettings.sidebarAccentProjectNames && appSettings.sidebarAccentColorOverride
? appSettings.sidebarAccentColorOverride
: appSettings.sidebarAccentProjectNames
? isDark
? pColor.textDark
: pColor.text
: undefined,
}}
>
{project.name}
</span>
Expand Down
187 changes: 64 additions & 123 deletions apps/web/src/components/chat/ChatHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
import {
type ProjectId,
type ProjectScript,
type ThreadId,
type ResolvedKeybindingsConfig,
} from "@okcode/contracts";
import { memo, useEffect } from "react";
import type { ProjectScriptDraft } from "~/projectScriptDefaults";
import GitActionsControl from "../GitActionsControl";
import {
ArrowLeftRightIcon,
ArrowUpDownIcon,
DiffIcon,
MonitorIcon,
TerminalSquareIcon,
} from "lucide-react";
import { EditableThreadTitle } from "../EditableThreadTitle";
import { Badge } from "../ui/badge";
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
import ProjectScriptsControl, { type NewProjectScriptInput } from "../ProjectScriptsControl";
import { Toggle } from "../ui/toggle";
import { SidebarTrigger } from "../ui/sidebar";
import { useThreadTitleEditor } from "~/hooks/useThreadTitleEditor";
import { OpenInPicker } from "./OpenInPicker";
import { useCodeViewerStore } from "~/codeViewerStore";
import { useProjectColor } from "~/projectColors";
import { useTheme } from "~/hooks/useTheme";
import type { ClientMode } from "~/lib/clientMode";

import type { PreviewDock } from "~/previewStateStore";
import { HeaderPanelsMenu } from "./HeaderPanelsMenu";

interface ChatHeaderProps {
activeThreadId: ThreadId;
activeThreadTitle: string;
activeProjectId: ProjectId | undefined;
activeProjectName: string | undefined;
activeProjectCwd: string | undefined;
isGitRepo: boolean;
Expand Down Expand Up @@ -63,6 +57,7 @@ interface ChatHeaderProps {
export const ChatHeader = memo(function ChatHeader({
activeThreadId,
activeThreadTitle,
activeProjectId,
activeProjectName,
activeProjectCwd,
isGitRepo,
Expand All @@ -77,7 +72,7 @@ export const ChatHeader = memo(function ChatHeader({
diffToggleShortcutLabel,
previewAvailable,
previewOpen,
previewDock,
previewDock: _previewDock,
gitCwd,
diffOpen,
clientMode,
Expand All @@ -90,12 +85,15 @@ export const ChatHeader = memo(function ChatHeader({
onToggleTerminal,
onToggleDiff,
onTogglePreview,
onTogglePreviewLayout,
onTogglePreviewLayout: _onTogglePreviewLayout,
onToggleCodeViewer,
}: ChatHeaderProps) {
const isMobileCompanion = clientMode === "mobile";
const codeViewerOpen = useCodeViewerStore((state) => state.isOpen);
const hasCodeViewerTabs = useCodeViewerStore((state) => state.tabs.length > 0);
const projectColor = useProjectColor(activeProjectId);
const { resolvedTheme } = useTheme();
const isDark = resolvedTheme === "dark";
const {
editingThreadId,
draftTitle,
Expand All @@ -117,6 +115,7 @@ export const ChatHeader = memo(function ChatHeader({

return (
<div className="flex min-w-0 flex-1 items-center gap-2">
{/* Left: Identity — thread title + project context */}
<div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden sm:gap-3">
<SidebarTrigger className="size-7 shrink-0 md:hidden" />
<EditableThreadTitle
Expand All @@ -141,17 +140,25 @@ export const ChatHeader = memo(function ChatHeader({
onCancel={cancelEditing}
/>
{activeProjectName && (
<Badge variant="outline" className="min-w-0 shrink truncate">
<Badge
variant="outline"
className="hidden min-w-0 shrink truncate border-transparent sm:inline-flex"
style={
projectColor
? {
color: isDark ? projectColor.textDark : projectColor.text,
backgroundColor: isDark ? projectColor.bgDark : projectColor.bg,
}
: undefined
}
>
{activeProjectName}
</Badge>
)}
{activeProjectName && !isGitRepo && (
<Badge variant="outline" className="shrink-0 text-[10px] text-amber-700">
No Git
</Badge>
)}
</div>
<div className="@container/header-actions flex min-w-0 flex-1 items-center justify-end gap-2 @sm/header-actions:gap-3">

{/* Right: Actions — only primary actions visible, panels in overflow */}
<div className="flex shrink-0 items-center gap-1.5 sm:gap-2">
{!isMobileCompanion && activeProjectScripts && (
<ProjectScriptsControl
projectCwd={activeProjectCwd ?? ""}
Expand All @@ -165,115 +172,49 @@ export const ChatHeader = memo(function ChatHeader({
onImportScripts={onImportProjectScripts}
/>
)}
{activeProjectName && hasCodeViewerTabs && (
<OpenInPicker codeViewerOpen={codeViewerOpen} onToggleCodeViewer={onToggleCodeViewer} />
)}
{!isMobileCompanion && activeProjectName && (
<GitActionsControl gitCwd={gitCwd} activeThreadId={activeThreadId} />
)}
{/* Overflow menu: all panel toggles consolidated */}
{!isMobileCompanion && (
<Tooltip>
<TooltipTrigger
render={
<Toggle
className="shrink-0"
pressed={terminalOpen}
onPressedChange={onToggleTerminal}
aria-label="Toggle terminal drawer"
variant="outline"
size="xs"
disabled={!terminalAvailable}
>
<TerminalSquareIcon className="size-3" />
</Toggle>
}
/>
<TooltipPopup side="bottom">
{!terminalAvailable
? "Terminal is unavailable until this thread has an active project."
: terminalToggleShortcutLabel
? `Toggle terminal drawer (${terminalToggleShortcutLabel})`
: "Toggle terminal drawer"}
</TooltipPopup>
</Tooltip>
)}
{!isMobileCompanion && previewOpen && previewAvailable ? (
<Tooltip>
<TooltipTrigger
render={
<Toggle
className="shrink-0"
pressed={previewDock === "top" || previewDock === "bottom"}
onPressedChange={onTogglePreviewLayout}
aria-label="Toggle preview split orientation"
variant="outline"
size="xs"
>
{previewDock === "top" || previewDock === "bottom" ? (
<ArrowUpDownIcon className="size-3" />
) : (
<ArrowLeftRightIcon className="size-3" />
)}
</Toggle>
}
/>
<TooltipPopup side="bottom">
{previewDock === "top" || previewDock === "bottom"
? "Switch to side-by-side preview"
: "Switch to stacked preview"}
</TooltipPopup>
</Tooltip>
) : null}
{!isMobileCompanion && (
<Tooltip>
<TooltipTrigger
render={
<Toggle
className="shrink-0"
pressed={previewOpen}
onPressedChange={onTogglePreview}
aria-label="Toggle preview panel"
variant="outline"
size="xs"
disabled={!previewAvailable}
>
<MonitorIcon className="size-3" />
</Toggle>
}
/>
<TooltipPopup side="bottom">
{!previewAvailable
? "Preview is available in the desktop app when this thread has an active project."
: previewOpen
? "Hide preview panel"
: "Show preview panel"}
</TooltipPopup>
</Tooltip>
<HeaderPanelsMenu
terminalAvailable={terminalAvailable}
terminalOpen={terminalOpen}
terminalToggleShortcutLabel={terminalToggleShortcutLabel}
previewAvailable={previewAvailable}
previewOpen={previewOpen}
diffOpen={diffOpen}
diffToggleShortcutLabel={diffToggleShortcutLabel}
isGitRepo={isGitRepo}
codeViewerOpen={codeViewerOpen}
hasCodeViewerTabs={hasCodeViewerTabs}
hasProject={activeProjectName !== undefined}
onToggleTerminal={onToggleTerminal}
onTogglePreview={onTogglePreview}
onToggleDiff={onToggleDiff}
onToggleCodeViewer={onToggleCodeViewer}
/>
)}
<Tooltip>
<TooltipTrigger
render={
<Toggle
className="shrink-0"
pressed={diffOpen}
onPressedChange={onToggleDiff}
aria-label="Toggle diff panel"
variant="outline"
size="xs"
disabled={!isGitRepo}
>
<DiffIcon className="size-3" />
</Toggle>
}
{/* Mobile: only diff toggle */}
{isMobileCompanion && (
<HeaderPanelsMenu
terminalAvailable={false}
terminalOpen={false}
terminalToggleShortcutLabel={null}
previewAvailable={false}
previewOpen={false}
diffOpen={diffOpen}
diffToggleShortcutLabel={diffToggleShortcutLabel}
isGitRepo={isGitRepo}
codeViewerOpen={false}
hasCodeViewerTabs={false}
hasProject={false}
onToggleTerminal={() => {}}
onTogglePreview={() => {}}
onToggleDiff={onToggleDiff}
onToggleCodeViewer={() => {}}
/>
<TooltipPopup side="bottom">
{!isGitRepo
? "Diff panel is unavailable because this project is not a git repository."
: diffToggleShortcutLabel
? `Toggle diff panel (${diffToggleShortcutLabel})`
: "Toggle diff panel"}
</TooltipPopup>
</Tooltip>
)}
</div>
</div>
);
Expand Down
Loading
Loading