Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

feat(web): refresh application surfaces

maria-rcksc5ff51ec1fff
diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx
index ef6b64be9..3a70390d0 100644
--- a/apps/web/src/components/AppSidebarLayout.tsx
+++ b/apps/web/src/components/AppSidebarLayout.tsx
@@ -106,6 +106,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
const pathname = useLocation({ select: (location) => location.pathname });
const isOnSettings = pathname === "/settings" || pathname.startsWith("/settings/");
const useSidebarV2 = sidebarV2Enabled && !isOnSettings;
+ const useSidebarV2Theme = useSidebarV2 || isOnSettings;
const isMacosDesktop = isElectron && isMacPlatform(navigator.platform);
const [sidebarWidth, setSidebarWidth] = useState(readInitialThreadSidebarWidth);
const sidebarMaximumWidth = resolveThreadSidebarMaximumWidth(window.innerWidth);
@@ -165,7 +166,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
side="left"
collapsible="offcanvas"
data-app-sidebar=""
- data-sidebar-version={useSidebarV2 ? "v2" : "v1"}
+ data-sidebar-version={useSidebarV2Theme ? "v2" : "v1"}
className="border-r border-sidebar-border bg-sidebar text-sidebar-foreground"
resizable={{
maxWidth: sidebarMaximumWidth,
diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index 0354c2e0c..62c5e20da 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -248,7 +248,7 @@ export const BranchToolbar = memo(function BranchToolbar({
if (!hasActiveThread || !activeProject) return null;
return (
- <div className="mx-auto flex w-full max-w-3xl items-center gap-2 px-2.5 pb-3 pt-1 sm:px-3">
+ <div className="chat-composer-context-strip -mt-2 mx-auto flex w-[calc(100%-1.5rem)] max-w-[calc(48rem-1.5rem)] items-center gap-2 pt-3 pe-2 pb-1 ps-2">
{isMobile ? (
<MobileRunContextSelector
envLocked={envLocked}
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 12dd68f46..974f204a8 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -2320,6 +2320,11 @@ function ChatViewContent(props: ChatViewProps) {
const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
}, [activeProviderInstanceId, providerStatuses, selectedProvider]);
+ const hasTimelineTopBanner =
+ Boolean(threadError) ||
+ (activeProviderStatus !== null &&
+ activeProviderStatus.status !== "ready" &&
+ activeProviderStatus.status !== "disabled");
const activeProjectCwd = activeProject?.workspaceRoot ?? null;
const activeThreadWorktreePath = activeThread?.worktreePath ?? null;
const activeWorkspaceRoot = activeThreadWorktreePath ?? activeProjectCwd ?? undefined;
@@ -5412,7 +5417,7 @@ function ChatViewContent(props: ChatViewProps) {
<header
data-chat-header
className={cn(
- "border-b border-border transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none",
+ "bg-background transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none",
isElectron
? cn(
"workspace-topbar drag-region relative px-3 sm:px-5",
@@ -5448,8 +5453,6 @@ function ChatViewContent(props: ChatViewProps) {
/>
</header>
- {/* Error banner */}
- <ProviderStatusBanner status={activeProviderStatus} />
<ThreadErrorBanner
error={threadError}
onDismiss={() => setThreadError(activeThread.id, null)}
@@ -5458,6 +5461,10 @@ function ChatViewContent(props: ChatViewProps) {
<div className="flex min-h-0 min-w-0 flex-1">
{/* Chat column */}
<div className="relative flex min-h-0 min-w-0 flex-1 flex-col">
+ {/* Provider status overlays the timeline without changing its content height. */}
+ <div className="pointer-events-none absolute inset-x-0 top-0 z-20">
+ <ProviderStatusBanner status={activeProviderStatus} />
+ </div>
{/* Messages Wrapper */}
<div className="relative flex min-h-0 flex-1 flex-col">
{/* Messages — LegendList handles virtualization and scrolling internally */}
@@ -5494,6 +5501,7 @@ function ChatViewContent(props: ChatViewProps) {
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
+ topFadeEnabled={!hasTimelineTopBanner}
/>
{/* scroll to end pill — shown when user has scrolled away from the live edge */}
@@ -5526,17 +5534,6 @@ function ChatViewContent(props: ChatViewProps) {
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
- {!isDraftHeroState ? (
- <div
- key="docked-composer-blur"
- aria-hidden="true"
- className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
- >
- <div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
- <div className="chat-composer-shared-blur absolute -inset-8" />
- </div>
- </div>
- ) : null}
<div
ref={attachDraftHeroTransitionGroupRef}
className="chat-composer-horizontal-inset w-full"
@@ -5574,7 +5571,7 @@ function ChatViewContent(props: ChatViewProps) {
>
<div
ref={attachDraftHeroComposerAnchorRef}
- className="relative z-10 mx-auto w-full max-w-3xl"
+ className="relative z-10 isolate mx-auto w-full max-w-3xl before:pointer-events-none before:absolute before:inset-x-0 before:bottom-0 before:-z-10 before:h-2 before:rounded-b-[22px] before:bg-background"
>
<ChatComposer
composerRef={composerRef}
@@ -5658,12 +5655,7 @@ function ChatViewContent(props: ChatViewProps) {
>
<div
data-terminal-open={terminalUiState.terminalOpen ? "true" : undefined}
- className={cn(
- "chat-composer-lower-chrome relative z-10",
- isGitRepo
- ? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
- : "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
- )}
+ className="chat-composer-lower-chrome relative z-0 pb-[calc(env(safe-area-inset-bottom)+1rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1.25rem)]"
>
{isGitRepo && (
<div className="pointer-events-auto">
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index bb83dfa56..4f330baf6 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -1948,7 +1948,7 @@ function OpenCommandPaletteDialog(props: {
<Button
variant="ghost"
size="xs"
- className="h-auto px-2 text-zinc-700 text-xs hover:bg-transparent hover:text-foreground dark:text-zinc-300"
+ className="h-auto px-2 text-muted-foreground text-xs hover:bg-transparent hover:text-foreground"
disabled={isPickingProjectFolder}
onClick={() => {
void handleOpenProjectFromFileManager();
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index 5cb2a1cfd..04d86f81e 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -521,27 +521,37 @@ export default function DiffPanel({
<ChevronDownIcon className="size-3.5 shrink-0 text-muted-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent align="start" className="w-60">
- <DropdownMenuItem onClick={() => selectGitScope("unstaged")}>
+ <DropdownMenuItem
+ className={
+ selectedTurnId === null && selectedGitScope === "unstaged"
+ ? "bg-foreground/[0.08]"
+ : undefined
+ }
+ onClick={() => selectGitScope("unstaged")}
+ >
<span>Working tree</span>
- {selectedTurnId === null && selectedGitScope === "unstaged" && (
- <CheckIcon className="ml-auto" />
- )}
</DropdownMenuItem>
- <DropdownMenuItem onClick={() => selectGitScope("branch")}>
+ <DropdownMenuItem
+ className={
+ selectedTurnId === null && selectedGitScope === "branch"
+ ? "bg-foreground/[0.08]"
+ : undefined
+ }
+ onClick={() => selectGitScope("branch")}
+ >
<span>Branch changes</span>
- {selectedTurnId === null && selectedGitScope === "branch" && (
- <CheckIcon className="ml-auto" />
- )}
</DropdownMenuItem>
<DropdownMenuItem
+ className={
+ selectedTurnId !== null && selectedTurn?.turnId === latestTurn?.turnId
+ ? "bg-foreground/[0.08]"
+ : undefined
+ }
onClick={() => {
if (latestTurn) selectTurn(latestTurn.turnId);
}}
>
<span>Latest turn</span>
- {selectedTurnId !== null && selectedTurn?.turnId === latestTurn?.turnId && (
- <CheckIcon className="ml-auto" />
- )}
</DropdownMenuItem>
<DropdownMenuSub>
<DropdownMenuSubTrigger>Turn</DropdownMenuSubTrigger>
@@ -554,13 +564,15 @@ export default function DiffPanel({
return (
<DropdownMenuItem
key={summary.turnId}
+ className={
+ summary.turnId === selectedTurn?.turnId ? "bg-foreground/[0.08]" : undefined
+ }
onClick={() => selectTurn(summary.turnId)}
>
<span>Turn {turnCount}</span>
<span className="ml-auto text-xs tabular-nums text-muted-foreground">
{formatShortTimestamp(summary.completedAt, settings.timestampFormat)}
</span>
- {summary.turnId === selectedTurn?.turnId && <CheckIcon className="ml-1" />}
</DropdownMenuItem>
);
})}
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index d4cf4002a..6eb217263 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -544,9 +544,9 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
return (
<Dialog open={props.open} onOpenChange={handleOpenChange}>
- <DialogPopup className="max-w-xl overflow-hidden">
- <div className="flex min-h-0 flex-col overflow-hidden border-foreground/10 bg-background shadow-2xl">
- <DialogHeader className="border-b border-border/70 bg-background">
+ <DialogPopup className="workflow-dialog-surface max-w-xl overflow-hidden before:hidden">
+ <div className="flex min-h-0 flex-col overflow-hidden border-foreground/10 bg-transparent">
+ <DialogHeader className="border-b border-border/70 bg-foreground/[0.025]">
<DialogTitle>Publish repository</DialogTitle>
<DialogDescription>
Pick where to host it, then point us at a repo to push to.
@@ -913,7 +913,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
</AnimatedHeight>
</DialogPanel>
- <DialogFooter>
+ <DialogFooter className="dark:border-white/5 dark:bg-white/[0.025]">
{publishWizardStep === 2 ? (
<Button size="sm" onClick={() => handleOpenChange(false)}>
Done
@@ -1736,7 +1736,7 @@ export default function GitActionsControl({
>
<ChevronDownIcon aria-hidden="true" className="size-4" />
</MenuTrigger>
- <MenuPopup align="end" className="w-full">
+ <MenuPopup align="end" className="command-menu-surface w-full">
{gitActionMenuItems.map((item) => {
const disabledReason = getMenuActionDisabledReason({
item,
@@ -1825,7 +1825,7 @@ export default function GitActionsControl({
}
}}
>
- <DialogPopup>
+ <DialogPopup className="workflow-dialog-surface before:hidden">
<DialogHeader>
<DialogTitle>{COMMIT_DIALOG_TITLE}</DialogTitle>
<DialogDescription>{COMMIT_DIALOG_DESCRIPTION}</DialogDescription>
@@ -1955,7 +1955,7 @@ export default function GitActionsControl({
/>
</div>
</DialogPanel>
- <DialogFooter>
+ <DialogFooter className="dark:border-white/5 dark:bg-white/[0.025]">
<Button
variant="outline"
size="sm"
@@ -1998,14 +1998,14 @@ export default function GitActionsControl({
}
}}
>
- <DialogPopup className="max-w-xl">
+ <DialogPopup className="workflow-dialog-surface max-w-xl before:hidden">
<DialogHeader>
<DialogTitle>
{pendingDefaultBranchActionCopy?.title ?? "Run action on default refName?"}
</DialogTitle>
<DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription>
</DialogHeader>
- <DialogFooter className="sm:flex-wrap sm:items-center">
+ <DialogFooter className="dark:border-white/5 dark:bg-white/[0.025] sm:flex-wrap sm:items-center">
<Button
className="w-full sm:mr-auto sm:w-auto"
variant="outline"
diff --git a/apps/web/src/components/ProjectScriptsControl.tsx b/apps/web/src/components/ProjectScriptsControl.tsx
index 4438a671f..13467dfb7 100644
--- a/apps/web/src/components/ProjectScriptsControl.tsx
+++ b/apps/web/src/components/ProjectScriptsControl.tsx
@@ -276,7 +276,7 @@ export default function ProjectScriptsControl({
>
<ChevronDownIcon className="size-4" />
</MenuTrigger>
- <MenuPopup align="end">
+ <MenuPopup align="end" className="command-menu-surface">
{scripts.map((script) => {
const shortcutLabel = shortcutLabelForCommand(
keybindings,
@@ -364,7 +364,7 @@ export default function ProjectScriptsControl({
}}
open={dialogOpen}
>
- <DialogPopup>
+ <DialogPopup className="workflow-dialog-surface before:hidden">
<DialogHeader>
<DialogTitle>{isEditing ? "Edit Action" : "Add Action"}</DialogTitle>
<DialogDescription>
@@ -389,7 +389,7 @@ export default function ProjectScriptsControl({
>
<ScriptIcon icon={icon} className="size-4.5" />
</PopoverTrigger>
- <PopoverPopup align="start">
+ <PopoverPopup align="start" className="command-menu-surface">
<div className="grid grid-cols-3 gap-2">
{SCRIPT_ICONS.map((entry) => {
const isSelected = entry.id === icon;
@@ -480,7 +480,7 @@ export default function ProjectScriptsControl({
{validationError && <p className="text-sm text-destructive">{validationError}</p>}
</form>
</DialogPanel>
- <DialogFooter>
+ <DialogFooter className="dark:border-white/5 dark:bg-white/[0.025]">
{isEditing && (
<Button
type="button"
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.ts
index a9b32a887..d0ad5ba90 100644
--- a/apps/web/src/components/Sidebar.logic.test.ts
+++ b/apps/web/src/components/Sidebar.logic.test.ts
@@ -834,26 +834,24 @@ describe("resolveThreadStatusPill", () => {
});
describe("resolveThreadRowClassName", () => {
- it("uses the darker selected palette when a thread is both selected and active", () => {
+ it("uses the active sidebar surface when a thread is both selected and active", () => {
const className = resolveThreadRowClassName({ isActive: true, isSelected: true });
- expect(className).toContain("bg-primary/22");
- expect(className).toContain("hover:bg-primary/26");
- expect(className).toContain("dark:bg-primary/30");
- expect(className).not.toContain("bg-accent/85");
+ expect(className).toContain("bg-sidebar-row-active");
+ expect(className).toContain("text-sidebar-foreground");
+ expect(className).not.toContain("bg-primary");
});
it("uses selected hover colors for selected threads", () => {
const className = resolveThreadRowClassName({ isActive: false, isSelected: true });
- expect(className).toContain("bg-primary/15");
- expect(className).toContain("hover:bg-primary/19");
- expect(className).toContain("dark:bg-primary/22");
- expect(className).not.toContain("hover:bg-accent");
+ expect(className).toContain("bg-sidebar-row-selected");
+ expect(className).toContain("hover:bg-sidebar-row-active");
+ expect(className).not.toContain("bg-primary");
});
- it("keeps the accent palette for active-only threads", () => {
+ it("uses the active sidebar surface for active-only threads", () => {
const className = resolveThreadRowClassName({ isActive: true, isSelected: false });
- expect(className).toContain("bg-accent/85");
- expect(className).toContain("hover:bg-accent");
+ expect(className).toContain("bg-sidebar-row-active");
+ expect(className).toContain("hover:bg-sidebar-row-active");
});
});
diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.ts
index b8ae19c3e..f17ba8bb3 100644
--- a/apps/web/src/components/Sidebar.logic.ts
+++ b/apps/web/src/components/Sidebar.logic.ts
@@ -391,30 +391,33 @@ export function resolveThreadRowClassName(input: {
isSelected: boolean;
}): string {
const baseClassName =
- "h-6 w-full translate-x-0 cursor-pointer justify-start px-2 text-left select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring sm:h-7";
+ "h-8 w-full translate-x-0 cursor-pointer justify-start rounded-md px-2 text-left text-sm select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring";
if (input.isSelected && input.isActive) {
return cn(
baseClassName,
- "bg-primary/22 text-foreground font-medium hover:bg-primary/26 hover:text-foreground dark:bg-primary/30 dark:hover:bg-primary/36",
+ "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
);
}
if (input.isSelected) {
return cn(
baseClassName,
- "bg-primary/15 text-foreground hover:bg-primary/19 hover:text-foreground dark:bg-primary/22 dark:hover:bg-primary/28",
+ "bg-sidebar-row-selected text-sidebar-foreground hover:bg-sidebar-row-active hover:text-sidebar-foreground",
);
}
if (input.isActive) {
return cn(
baseClassName,
- "bg-accent/85 text-foreground font-medium hover:bg-accent hover:text-foreground dark:bg-accent/55 dark:hover:bg-accent/70",
+ "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
);
}
- return cn(baseClassName, "text-muted-foreground hover:bg-accent hover:text-foreground");
+ return cn(
+ baseClassName,
+ "text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground",
+ );
}
// ── Sidebar v2 status model ─────────────────────────────────────────
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index b9bdc1c04..00f579ebb 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -714,7 +714,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
{renamingThreadKey === threadKey ? (
<input
ref={handleRenameInputRef}
- className="min-w-0 flex-1 truncate text-base sm:text-xs bg-transparent outline-none border border-ring rounded px-0.5"
+ className="min-w-0 flex-1 truncate rounded border border-ring bg-transparent px-0.5 text-sm outline-none"
value={renamingTitle}
onChange={handleRenameInputChange}
onKeyDown={handleRenameInputKeyDown}
@@ -727,7 +727,7 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
<TooltipTrigger
render={
<span
- className="min-w-0 flex-1 truncate text-xs"
+ className="min-w-0 flex-1 truncate text-sm"
data-testid={`thread-title-${thread.id}`}
>
{thread.title}
@@ -982,13 +982,13 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
return (
<SidebarMenuSub
ref={attachThreadListAutoAnimateRef}
- className="mx-0.5 my-0 w-full translate-x-0 gap-0.5 overflow-hidden px-1 py-0 sm:mx-1 sm:px-1.5"
+ className="mx-0.5 my-0 w-full translate-x-0 gap-0.5 overflow-hidden border-l-0 px-1 py-0 sm:mx-1 sm:px-1.5"
>
{shouldShowThreadPanel && showEmptyThreadState ? (
<SidebarMenuSubItem className="w-full" data-thread-selection-safe>
<div
data-thread-selection-safe
- className="flex h-6 w-full translate-x-0 items-center px-2 text-left text-[10px] text-muted-foreground/60"
+ className="flex h-8 w-full translate-x-0 items-center px-2 text-left text-xs text-sidebar-muted-foreground/75"
>
<span>No threads yet</span>
</div>
@@ -1034,7 +1034,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
render={showMoreButtonRender}
data-thread-selection-safe
size="sm"
- className="h-6 w-full translate-x-0 justify-start px-2 text-left text-[10px] text-muted-foreground/60 hover:bg-accent hover:text-muted-foreground/80"
+ className="h-8 w-full translate-x-0 justify-start px-2 text-left text-xs text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
onClick={() => {
expandThreadListForProject(projectKey);
}}
@@ -1052,7 +1052,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
render={showLessButtonRender}
data-thread-selection-safe
size="sm"
- className="h-6 w-full translate-x-0 justify-start px-2 text-left text-[10px] text-muted-foreground/60 hover:bg-accent hover:text-muted-foreground/80"
+ className="h-8 w-full translate-x-0 justify-start px-2 text-left text-xs text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
onClick={() => {
collapseThreadListForProject(projectKey);
}}
@@ -2252,7 +2252,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
<SidebarMenuButton
ref={isManualProjectSorting ? dragHandleProps?.setActivatorNodeRef : undefined}
size="sm"
- className={`gap-2 px-2 py-1.5 pr-8 text-left hover:bg-sidebar-row-hover group-hover/project-header:bg-sidebar-row-hover group-hover/project-header:text-sidebar-foreground max-sm:pr-14 ${
+ className={`h-8 gap-2 rounded-md px-2 py-1.5 pr-8 text-left hover:bg-sidebar-row-hover group-hover/project-header:bg-sidebar-row-hover group-hover/project-header:text-sidebar-foreground max-sm:pr-14 ${
isManualProjectSorting ? "cursor-grab active:cursor-grabbing" : "cursor-pointer"
}`}
{...(isManualProjectSorting && dragHandleProps ? dragHandleProps.attributes : {})}
@@ -2292,7 +2292,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
)}
<ProjectFavicon environmentId={project.environmentId} cwd={project.workspaceRoot} />
<span className="flex min-w-0 flex-1 items-center gap-2">
- <span className="truncate text-xs font-medium text-foreground/90">
+ <span className="truncate text-sm font-medium text-sidebar-foreground/90">
{project.displayName}
</span>
{project.groupedProjectCount > 1 ? (
@@ -2899,13 +2899,13 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
render={
<SidebarMenuButton
size="sm"
- className="gap-2 px-2 py-1.5 text-muted-foreground/70 hover:bg-accent hover:text-foreground focus-visible:ring-0"
+ className="h-8 gap-2 rounded-md px-2 py-1.5 text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-0"
data-testid="command-palette-trigger"
/>
}
>
- <SearchIcon className="size-3.5 text-muted-foreground/70" />
- <span className="flex-1 truncate text-left text-xs">Search</span>
+ <SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
+ <span className="flex-1 truncate text-left text-sm font-medium">Search</span>
{commandPaletteShortcutLabel ? (
<Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">
{commandPaletteShortcutLabel}
@@ -2941,9 +2941,7 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
<LocalSecondaryStatus />
<SidebarGroup className="px-2 py-2">
<div className="mb-1 flex items-center justify-between pl-2 pr-1.5">
- <span className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground/60">
- Projects
- </span>
+ <span className="text-xs font-medium text-sidebar-muted-foreground/80">Projects</span>
<div className="flex items-center gap-1">
<ProjectSortMenu
projectSortOrder={projectSortOrder}
diff --git a/apps/web/src/components/SidebarStageBackdrop.test.tsx b/apps/web/src/components/SidebarStageBackdrop.test.tsx
new file mode 100644
index 000000000..41aee21e3
--- /dev/null
+++ b/apps/web/src/components/SidebarStageBackdrop.test.tsx
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vite-plus/test";
+import { renderToStaticMarkup } from "react-dom/server";
+
+import { StageBackdropArt, StageBackdropButtonArt } from "./SidebarStageBackdrop";
+
+describe("SidebarStageBackdrop", () => {
+ it.each(["nightly", "dev"] as const)(
+ "uses unique SVG definition ids when %s artwork is rendered more than once",
+ (variant) => {
+ const markup = renderToStaticMarkup(
+ <>
+ <StageBackdropArt variant={variant} />
+ <StageBackdropButtonArt variant={variant} />
+ </>,
+ );
+ const ids = Array.from(markup.matchAll(/\sid="([^"]+)"/g), (match) => match[1]);
+
+ expect(ids.length).toBeGreaterThan(0);
+ expect(new Set(ids).size).toBe(ids.length);
+ },
+ );
+});
diff --git a/apps/web/src/components/SidebarStageBackdrop.tsx b/apps/web/src/components/SidebarStageBackdrop.tsx
index 6f0953a97..ba3de64de 100644
--- a/apps/web/src/components/SidebarStageBackdrop.tsx
+++ b/apps/web/src/components/SidebarStageBackdrop.tsx
@@ -1,4 +1,5 @@
import { useAtomValue } from "@effect/atom-react";
+import { useId } from "react";
import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
@@ -47,6 +48,10 @@ export function StageBackdropArt({ variant }: { variant: SidebarStageBackdropVar
return variant === "nightly" ? <NightlySkyArt /> : <DevBlueprintArt />;
}
+export function StageBackdropButtonArt({ variant }: { variant: SidebarStageBackdropVariant }) {
+ return variant === "nightly" ? <NightlySkyArt compact /> : <DevBlueprintArt compact />;
+}
+
const NIGHTLY_STARS: ReadonlyArray<{
cx: number;
cy: number;
@@ -78,18 +83,26 @@ const NIGHTLY_SPARKLES: ReadonlyArray<{ x: number; y: number }> = [
{ x: 246, y: 26 },
];
-function NightlySkyArt() {
+function NightlySkyArt({ compact = false }: { compact?: boolean }) {
+ const idPrefix = useId().replaceAll(":", "");
+ const skyId = `${idPrefix}-stage-night-sky`;
+ const glowId = `${idPrefix}-stage-night-glow`;
+ const cloudId = `${idPrefix}-stage-night-cloud`;
+ const softId = `${idPrefix}-stage-night-soft`;
+ const starsId = `${idPrefix}-stage-night-stars`;
+ const glowsId = `${idPrefix}-stage-night-glows`;
+
return (
<svg
className="h-full w-full"
fill="none"
preserveAspectRatio="xMinYMin slice"
- viewBox={STAGE_BACKDROP_VIEW_BOX}
+ viewBox={compact ? "96 0 8192 96" : STAGE_BACKDROP_VIEW_BOX}
xmlns="http://www.w3.org/2000/svg"
>
<defs>
<linearGradient
- id="stage-night-sky"
+ id={skyId}
x1="24"
y1="0"
x2="264"
@@ -102,7 +115,7 @@ function NightlySkyArt() {
<stop offset="1" stopColor="#32155B" />
</linearGradient>
<radialGradient
- id="stage-night-glow"
+ id={glowId}
cx="0"
cy="0"
r="1"
@@ -113,29 +126,15 @@ function NightlySkyArt() {
<stop offset="0.5" stopColor="#283075" stopOpacity="0.16" />
<stop offset="1" stopColor="#111635" stopOpacity="0" />
</radialGradient>
- <linearGradient
- id="stage-night-cloud"
- x1="0"
- y1="60"
- x2="288"
- y2="96"
- gradientUnits="userSpaceOnUse"
- >
+ <linearGradient id={cloudId} x1="0" y1="60" x2="288" y2="96" gradientUnits="userSpaceOnUse">
<stop stopColor="#4EA4FF" stopOpacity="0.5" />
<stop offset="0.52" stopColor="#696FEA" stopOpacity="0.62" />
<stop offset="1" stopColor="#A85BEA" stopOpacity="0.5" />
</linearGradient>
- <filter
- id="stage-night-soft"
- x="-24"
- y="-24"
- width="336"
- height="144"
- filterUnits="userSpaceOnUse"
- >
+ <filter id={softId} x="-24" y="-24" width="336" height="144" filterUnits="userSpaceOnUse">
<feGaussianBlur stdDeviation="4" />
</filter>
- <pattern id="stage-night-stars" width="288" height="96" patternUnits="userSpaceOnUse">
+ <pattern id={starsId} width="288" height="96" patternUnits="userSpaceOnUse">
<g fill="#E4EAFF">
{NIGHTLY_STARS.map((star) => (
<circle
@@ -156,25 +155,25 @@ function NightlySkyArt() {
))}
</g>
</pattern>
- <pattern id="stage-night-glows" width="640" height="96" patternUnits="userSpaceOnUse">
- <rect width="640" height="96" fill="url(#stage-night-glow)" />
+ <pattern id={glowsId} width="640" height="96" patternUnits="userSpaceOnUse">
+ <rect width="640" height="96" fill={`url(#${glowId})`} />
</pattern>
</defs>
- <rect width="100%" height="96" fill="url(#stage-night-sky)" />
- <rect width="100%" height="96" fill="url(#stage-night-glows)" />
- <rect width="100%" height="96" fill="url(#stage-night-stars)" />
+ <rect width="100%" height="96" fill={`url(#${skyId})`} />
+ <rect width="100%" height="96" fill={`url(#${glowsId})`} />
+ <rect width="100%" height="96" fill={`url(#${starsId})`} />
- <g filter="url(#stage-night-soft)">
+ <g filter={`url(#${softId})`}>
<path
d="M-12 88C-12 74 0 63 14 63C18 50 30 41 44 41C58 41 70 49 74 62C79 57 86 54 94 54C110 54 123 66 124 82C132 83 138 88 141 96H-12V88Z"
- fill="url(#stage-night-cloud)"
+ fill={`url(#${cloudId})`}
/>
</g>
- <g filter="url(#stage-night-soft)">
+ <g filter={`url(#${softId})`}>
<path
d="M150 96C151 84 161 75 173 75C176 64 186 57 198 57C210 57 220 64 223 75C231 75 238 80 241 87C250 87 257 91 260 96H150Z"
- fill="url(#stage-night-cloud)"
+ fill={`url(#${cloudId})`}
fillOpacity="0.8"
/>
</g>
@@ -182,18 +181,29 @@ function NightlySkyArt() {
);
}
-function DevBlueprintArt() {
+function DevBlueprintArt({ compact = false }: { compact?: boolean }) {
+ const idPrefix = useId().replaceAll(":", "");
+ const paperId = `${idPrefix}-stage-bp-paper`;
+ const glowId = `${idPrefix}-stage-bp-glow`;
+ const celesteGlowId = `${idPrefix}-stage-bp-glow-celeste`;
+ const violetGlowId = `${idPrefix}-stage-bp-glow-violet`;
+ const minorGridId = `${idPrefix}-stage-bp-grid-minor`;
+ const majorGridId = `${idPrefix}-stage-bp-grid-major`;
+ const rulerId = `${idPrefix}-stage-bp-ruler`;
+ const glowsId = `${idPrefix}-stage-bp-glows`;
+ const annotationsId = `${idPrefix}-stage-bp-annotations`;
+
return (
<svg
className="stage-blueprint h-full w-full"
fill="none"
preserveAspectRatio="xMinYMin slice"
- viewBox={STAGE_BACKDROP_VIEW_BOX}
+ viewBox={compact ? "64 0 8192 96" : STAGE_BACKDROP_VIEW_BOX}
xmlns="http://www.w3.org/2000/svg"
>
<defs>
<linearGradient
- id="stage-bp-paper"
+ id={paperId}
x1="60"
y1="0"
x2="220"
@@ -206,7 +216,7 @@ function DevBlueprintArt() {
<stop offset="1" style={{ stopColor: "var(--stage-bp-top)" }} />
</linearGradient>
<radialGradient
- id="stage-bp-glow"
+ id={glowId}
cx="0"
cy="0"
r="1"
@@ -218,7 +228,7 @@ function DevBlueprintArt() {
<stop offset="1" stopColor="#276AF1" stopOpacity="0" />
</radialGradient>
<radialGradient
- id="stage-bp-glow-celeste"
+ id={celesteGlowId}
cx="0"
cy="0"
r="1"
@@ -230,7 +240,7 @@ function DevBlueprintArt() {
<stop offset="1" stopColor="#277EF1" stopOpacity="0" />
</radialGradient>
<radialGradient
- id="stage-bp-glow-violet"
+ id={violetGlowId}
cx="0"
cy="0"
r="1"
@@ -241,13 +251,13 @@ function DevBlueprintArt() {
<stop offset="0.52" stopColor="#7C8BFF" stopOpacity="0.14" />
<stop offset="1" stopColor="#3155DF" stopOpacity="0" />
</radialGradient>
- <pattern id="stage-bp-grid-minor" width="8" height="8" patternUnits="userSpaceOnUse">
+ <pattern id={minorGridId} width="8" height="8" patternUnits="userSpaceOnUse">
<path d="M8 0H0V8" stroke="#EAF6FF" strokeOpacity="0.14" strokeWidth="0.5" />
</pattern>
- <pattern id="stage-bp-grid-major" width="32" height="32" patternUnits="userSpaceOnUse">
+ <pattern id={majorGridId} width="32" height="32" patternUnits="userSpaceOnUse">
<path d="M32 0H0V32" stroke="#EAF6FF" strokeOpacity="0.26" strokeWidth="0.6" />
</pattern>
- <pattern id="stage-bp-ruler" width="32" height="6" patternUnits="userSpaceOnUse">
+ <pattern id={rulerId} width="32" height="6" patternUnits="userSpaceOnUse">
<path
d="M4 0V2.5M12 0V2.5M20 0V4M28 0V2.5"
stroke="#DDF7FF"
@@ -255,12 +265,12 @@ function DevBlueprintArt() {
strokeWidth="0.5"
/>
</pattern>
- <pattern id="stage-bp-glows" width="768" height="96" patternUnits="userSpaceOnUse">
- <rect width="768" height="96" fill="url(#stage-bp-glow)" />
- <rect width="768" height="96" fill="url(#stage-bp-glow-celeste)" />
- <rect width="768" height="96" fill="url(#stage-bp-glow-violet)" />
+ <pattern id={glowsId} width="768" height="96" patternUnits="userSpaceOnUse">
+ <rect width="768" height="96" fill={`url(#${glowId})`} />
+ <rect width="768" height="96" fill={`url(#${celesteGlowId})`} />
+ <rect width="768" height="96" fill={`url(#${violetGlowId})`} />
</pattern>
- <pattern id="stage-bp-annotations" width="768" height="96" patternUnits="userSpaceOnUse">
+ <pattern id={annotationsId} width="768" height="96" patternUnits="userSpaceOnUse">
<g stroke="#DDF7FF" strokeLinecap="round" strokeOpacity="0.6" strokeWidth="0.7">
<path d="M180 64H264" strokeDasharray="5 4" />
<path d="M180 61V67M264 61V67" />
@@ -309,12 +319,12 @@ function DevBlueprintArt() {
</pattern>
</defs>
- <rect width="100%" height="96" fill="url(#stage-bp-paper)" />
- <rect width="100%" height="96" fill="url(#stage-bp-glows)" />
- <rect width="100%" height="96" fill="url(#stage-bp-grid-minor)" />
- <rect width="100%" height="96" fill="url(#stage-bp-grid-major)" />
- <rect width="100%" height="6" fill="url(#stage-bp-ruler)" />
- <rect width="100%" height="96" fill="url(#stage-bp-annotations)" />
+ <rect width="100%" height="96" fill={`url(#${paperId})`} />
+ <rect width="100%" height="96" fill={`url(#${glowsId})`} />
+ <rect width="100%" height="96" fill={`url(#${minorGridId})`} />
+ <rect width="100%" height="96" fill={`url(#${majorGridId})`} />
+ <rect width="100%" height="6" fill={`url(#${rulerId})`} />
+ <rect width="100%" height="96" fill={`url(#${annotationsId})`} />
</svg>
);
}
diff --git a/apps/web/src/components/SidebarV2.tsx b/apps/web/src/components/SidebarV2.tsx
index 2b81c15c7..9e48b7fe3 100644
--- a/apps/web/src/components/SidebarV2.tsx
+++ b/apps/web/src/components/SidebarV2.tsx
@@ -1,7 +1,10 @@
import { autoAnimate } from "@formkit/auto-animate";
import { useAtomValue } from "@effect/atom-react";
import { effectiveSettled } from "@t3tools/client-runtime/state/thread-settled";
-import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/models";
+import type {
+ EnvironmentProject,
+ EnvironmentThreadShell,
+} from "@t3tools/client-runtime/state/models";
import {
scopeProjectRef,
scopeThreadRef,
@@ -11,9 +14,9 @@ import type { ScopedThreadRef } from "@t3tools/contracts";
import {
CheckIcon,
ChevronDownIcon,
+ CircleAlertIcon,
CircleCheckIcon,
CircleDashedIcon,
- CircleAlertIcon,
FolderIcon,
FolderPlusIcon,
GitBranchIcon,
@@ -22,6 +25,7 @@ import {
SearchIcon,
ServerIcon,
SquarePenIcon,
+ Trash2Icon,
Undo2Icon,
} from "lucide-react";
import {
@@ -69,6 +73,7 @@ import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
+import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import { useAtomCommand } from "../state/use-atom-command";
import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";
@@ -94,15 +99,10 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Kbd } from "./ui/kbd";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
-import {
- SidebarContent,
- SidebarGroup,
- SidebarMenuButton,
- SidebarSeparator,
- useSidebar,
-} from "./ui/sidebar";
+import { SidebarContent, SidebarGroup, SidebarMenuButton, useSidebar } from "./ui/sidebar";
import { SidebarChromeFooter, SidebarChromeHeader } from "./sidebar/SidebarChrome";
import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
+import { useComposerDraftStore } from "../composerDraftStore";
// Settled-tail paging: recent history is the common lookup; the deep tail
// stays behind an explicit Show more.
@@ -127,7 +127,6 @@ function SidebarV2ThreadTooltip({
driverKind,
modelInstanceId,
modelLabel,
- status,
branchMismatch,
}: {
thread: SidebarThreadSummary;
@@ -137,11 +136,6 @@ function SidebarV2ThreadTooltip({
driverKind: ProviderInstanceEntry["driverKind"] | null;
modelInstanceId: string;
modelLabel: string;
- status: {
- label: string;
- className: string;
- icon: "working" | "done" | null;
- } | null;
branchMismatch: {
threadBranch: string;
currentBranch: string;
@@ -152,58 +146,31 @@ function SidebarV2ThreadTooltip({
side="right"
align="start"
sideOffset={8}
- className="w-80 text-left whitespace-normal shadow-lg/10 dark:border-transparent dark:shadow-none dark:inset-ring-1 dark:inset-ring-white/5"
+ className="dropdown-glass max-w-80 border-0! bg-secondary! text-left whitespace-normal shadow-lg/10 before:hidden dark:shadow-none"
>
- <div className="flex w-full flex-col gap-3 p-2">
- <div className="flex min-w-0 items-start gap-3">
- <div className="min-w-0 flex-1 text-sm font-medium text-foreground">{thread.title}</div>
- {status ? (
- <div
- className={cn(
- "inline-flex shrink-0 items-center gap-1 text-xs font-medium",
- status.className,
- )}
- >
- {status.icon === "working" ? (
- <CircleDashedIcon aria-hidden className="size-4 shrink-0" />
- ) : status.icon === "done" ? (
- <CircleCheckIcon aria-hidden className="size-4 shrink-0" />
- ) : null}
- {status.label}
- </div>
- ) : (
- <div className="shrink-0 tabular-nums text-xs text-muted-foreground">
- {threadTimeLabel(thread)}
- </div>
- )}
- </div>
- <div className="grid gap-2 text-xs text-muted-foreground">
+ <div className="flex max-w-80 flex-col gap-2 p-2">
+ <div className="whitespace-nowrap text-sm font-medium text-foreground">{thread.title}</div>
+ <div className="grid gap-1.5 text-xs text-muted-foreground">
{projectTitle ? (
- <div className="flex min-w-0 items-start gap-2">
+ <div className="flex min-w-0 items-center gap-2">
<ProjectFavicon
environmentId={thread.environmentId}
cwd={projectCwd ?? ""}
className="size-4 shrink-0"
/>
- <div className="min-w-0 flex-1 wrap-break-word text-foreground/90">
- {projectTitle}
- </div>
+ <div className="min-w-0 wrap-break-word text-foreground/90">{projectTitle}</div>
</div>
) : null}
{environmentLabel ? (
- <div className="flex min-w-0 items-start gap-2">
+ <div className="flex min-w-0 items-center gap-2">
<ServerIcon className="size-4 shrink-0 stroke-muted-foreground" />
- <div className="min-w-0 flex-1 wrap-break-word text-foreground/90">
- {environmentLabel}
- </div>
+ <div className="min-w-0 wrap-break-word text-foreground/90">{environmentLabel}</div>
</div>
) : null}
{thread.branch ? (
- <div className="flex min-w-0 items-start gap-2">
+ <div className="flex min-w-0 items-center gap-2">
<GitBranchIcon className="size-4 shrink-0 stroke-muted-foreground" />
- <div className="min-w-0 flex-1 wrap-break-word text-foreground/90">
- {thread.branch}
- </div>
+ <div className="min-w-0 wrap-break-word text-foreground/90">{thread.branch}</div>
</div>
) : null}
{branchMismatch ? (
@@ -215,19 +182,19 @@ function SidebarV2ThreadTooltip({
</div>
) : null}
{driverKind ? (
- <div className="flex min-w-0 items-start gap-2">
+ <div className="flex min-w-0 items-center gap-2">
<ProviderInstanceIcon
driverKind={driverKind}
displayName={thread.session?.providerName ?? modelInstanceId}
iconClassName="size-4 shrink-0"
/>
- <div className="min-w-0 flex-1 wrap-break-word text-foreground/90">{modelLabel}</div>
+ <div className="min-w-0 wrap-break-word text-foreground/90">{modelLabel}</div>
</div>
) : null}
{thread.session?.lastError ? (
- <div className="flex min-w-0 items-start gap-2 text-red-600 dark:text-red-400">
+ <div className="flex min-w-0 items-center gap-2 text-red-600 dark:text-red-400">
<CircleAlertIcon className="size-4 shrink-0 stroke-current" />
- <div className="min-w-0 flex-1 wrap-break-word">{thread.session.lastError}</div>
+ <div className="min-w-0 wrap-break-word">{thread.session.lastError}</div>
</div>
) : null}
</div>
@@ -383,7 +350,6 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
driverKind={driverKind}
modelInstanceId={modelInstanceId}
modelLabel={modelLabel}
- status={topStatus}
branchMismatch={branchMismatch}
/>
);
@@ -474,10 +440,11 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
// content; surface is reserved for interaction (hover, multi-select, route).
const rowSurfaceClassName = cn(
"group/v2-row relative w-full cursor-pointer overflow-hidden rounded-md text-left outline-none select-none",
+ variant === "card" && "backdrop-blur-[16px]",
props.isActive
- ? "bg-sidebar-row-active text-sidebar-foreground dark:inset-ring-1 dark:inset-ring-white/5"
+ ? "bg-sidebar-row-active text-sidebar-foreground"
: isSelected
- ? "bg-sidebar-row-selected text-sidebar-foreground dark:inset-ring-1 dark:inset-ring-white/5"
+ ? "bg-sidebar-row-selected text-sidebar-foreground"
: shouldRecede
? "text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
: "bg-transparent text-sidebar-foreground hover:bg-sidebar-row-hover",
@@ -758,6 +725,9 @@ export default function SidebarV2() {
const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
reportFailure: false,
});
+ const deleteProject = useAtomCommand(projectEnvironment.delete, {
+ reportFailure: false,
+ });
const newThreadContext = useHandleNewThread();
const openAddProjectCommandPalette = useCallback(
() => openCommandPalette({ open: "add-project" }),
@@ -872,6 +842,77 @@ export default function SidebarV2() {
clearSelection();
}, [clearSelection, projectScopeKey]);
+ const handleRemoveProject = useCallback(
+ async (project: EnvironmentProject) => {
+ const api = readLocalApi();
+ if (!api) return;
+
+ const projectThreads = threads.filter(
+ (thread) =>
+ thread.environmentId === project.environmentId && thread.projectId === project.id,
+ );
+ const confirmed = await settlePromise(() =>
+ api.dialogs.confirm(
+ projectThreads.length > 0
+ ? [
+ `Remove project "${project.title}" and delete its ${projectThreads.length} thread${projectThreads.length === 1 ? "" : "s"}?`,
+ `Path: ${project.workspaceRoot}`,
+ "This permanently clears conversation history for those threads.",
+ "This removes only the project entry, not the files on disk.",
+ "This action cannot be undone.",
+ ].join("\n")
+ : [
+ `Remove project "${project.title}"?`,
+ `Path: ${project.workspaceRoot}`,
+ "This removes only the project entry, not the files on disk.",
+ ].join("\n"),
+ ),
+ );
+ if (confirmed._tag === "Failure" || !confirmed.value) return;
+
+ const projectRef = scopeProjectRef(project.environmentId, project.id);
+ const result = await deleteProject({
+ environmentId: project.environmentId,
+ input: {
+ projectId: project.id,
+ ...(projectThreads.length > 0 ? { force: true } : {}),
+ },
+ });
+ if (result._tag === "Failure") {
+ if (!isAtomCommandInterrupted(result)) {
+ const error = squashAtomCommandFailure(result);
+ toastManager.add(
+ stackedThreadToast({
+ type: "error",
+ title: `Failed to remove "${project.title}"`,
+ description: error instanceof Error ? error.message : "An error occurred.",
+ }),
+ );
+ }
+ return;
+ }
+
+ const draftStore = useComposerDraftStore.getState();
+ const projectDraftThread = draftStore.getDraftThreadByProjectRef(projectRef);
+ if (projectDraftThread) {
+ draftStore.clearDraftThread(projectDraftThread.draftId);
+ }
+ draftStore.clearProjectDraftThreadId(projectRef);
+
+ if (
+ routeThreadRef &&
+ projectThreads.some(
+ (thread) =>
+ thread.environmentId === routeThreadRef.environmentId &&
+ thread.id === routeThreadRef.threadId,
+ )
+ ) {
+ void router.navigate({ to: "/" });
+ }
+ },
+ [deleteProject, routeThreadRef, router, threads],
+ );
+
// Settled threads stay in the live shell stream (settled ≠ archived), so
// the partition works directly off live shells: no archived-snapshot
// merging, no optimistic holds. Archived threads remain hidden here —
@@ -1542,10 +1583,10 @@ export default function SidebarV2() {
<MenuRadioItem
value="all"
closeOnClick
- className="[&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
+ className="h-8 min-h-8 px-1 py-0 text-sm font-medium [&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
>
- <FolderIcon className="size-3.5" />
- <span className="min-w-0 truncate">All projects</span>
+ <FolderIcon className="size-4 shrink-0" />
+ <span className="min-w-0 truncate text-sm">All projects</span>
</MenuRadioItem>
{projects.map((project) => {
const scopeKey = `${project.environmentId}:${project.id}`;
@@ -1554,14 +1595,28 @@ export default function SidebarV2() {
key={scopeKey}
value={scopeKey}
closeOnClick
- className="[&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
+ className="h-8 min-h-8 px-1 py-0 text-sm font-medium [&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
>
<ProjectFavicon
environmentId={project.environmentId}
cwd={project.workspaceRoot}
- className="size-3.5"
+ className="size-4 shrink-0"
/>
- <span className="min-w-0 truncate">{project.title}</span>
+ <span className="min-w-0 truncate text-sm">{project.title}</span>
+ <button
+ type="button"
+ aria-label={`Remove project ${project.title}`}
+ title={`Remove ${project.title}`}
+ className="ml-auto inline-flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/55 outline-none transition-colors hover:bg-destructive/12 hover:text-destructive focus-visible:bg-destructive/12 focus-visible:text-destructive focus-visible:ring-2 focus-visible:ring-destructive/40"
+ onPointerDown={(event) => event.stopPropagation()}
+ onClick={(event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ void handleRemoveProject(project);
+ }}
+ >
+ <Trash2Icon className="size-3.5" />
+ </button>
</MenuRadioItem>
);
})}
@@ -1718,9 +1773,6 @@ export default function SidebarV2() {
) : null}
</SidebarGroup>
</SidebarContent>
- <div className="shrink-0 px-2">
- <SidebarSeparator className="mx-0 w-full bg-sidebar-border/80" />
- </div>
<SidebarChromeFooter />
</>
);
diff --git a/apps/web/src/components/chat/ChangedFilesTree.tsx b/apps/web/src/components/chat/ChangedFilesTree.tsx
index 6fc1462c5..710ddea41 100644
--- a/apps/web/src/components/chat/ChangedFilesTree.tsx
+++ b/apps/web/src/components/chat/ChangedFilesTree.tsx
@@ -41,7 +41,7 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
const summaryStat = useMemo(() => summarizeTurnDiffStats(files), [files]);
return (
- <div className="mt-4 rounded-2xl border border-input bg-background p-2 pt-4 shadow-xs/5 not-dark:bg-clip-padding dark:bg-input/32">
+ <div className="mt-4 rounded-2xl bg-background p-2 pt-4 shadow-xs/5 not-dark:bg-clip-padding dark:bg-input/32">
<div className="sticky top-0 z-10 mb-3 flex items-center justify-between gap-2 bg-background px-2 before:absolute before:inset-x-0 before:-top-4 before:h-4 before:bg-background before:content-[''] dark:bg-[color-mix(in_srgb,var(--foreground)_2.5%,var(--background))] dark:before:bg-[color-mix(in_srgb,var(--foreground)_2.5%,var(--background))]">
<p className="flex items-center gap-1 whitespace-nowrap font-medium text-foreground text-xs leading-4">
<span>
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index ebc4c48f0..264575a1d 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -99,7 +99,6 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
import { toastManager } from "../ui/toast";
import {
BotIcon,
- CheckIcon,
CircleAlertIcon,
ListTodoIcon,
PencilRulerIcon,
@@ -280,7 +279,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
{runtimeModeOptions.map((mode) => {
const option = runtimeModeConfig[mode];
const OptionIcon = option.icon;
- const isSelected = props.runtimeMode === mode;
return (
<SelectItem key={mode} value={mode} hideIndicator className="min-w-64 py-2">
<div className="flex min-w-0 items-center gap-3">
@@ -293,12 +291,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
{option.description}
</span>
</div>
- <CheckIcon
- className={cn(
- "size-4 text-blue-400",
- isSelected ? "opacity-100" : "opacity-0",
- )}
- />
</div>
</SelectItem>
);
@@ -2162,10 +2154,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
ref={composerSurfaceRef}
data-chat-composer-mobile-collapsed={isComposerCollapsedMobile ? "true" : "false"}
className={cn(
- "chat-composer-glass rounded-[20px] border transition-[background-color] duration-200 has-focus-visible:border-foreground/40",
- isDragOverComposer
- ? "border-primary/70 bg-accent/45"
- : "border-black/12 dark:border-transparent dark:inset-ring-1 dark:inset-ring-white/5",
+ "chat-composer-glass rounded-[20px] transition-[background-color] duration-200",
+ isDragOverComposer ? "bg-accent/45 ring-1 ring-primary/70" : null,
projectSelectionRequired ? "opacity-75" : null,
composerProviderState.composerSurfaceClassName,
)}
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index 8999e4308..3e664e226 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -1,6 +1,7 @@
import { memo, type PointerEventHandler } from "react";
import { ChevronDownIcon, ChevronLeftIcon } from "lucide-react";
import { cn } from "~/lib/utils";
+import { StageBackdropButtonArt, useSidebarStageBackdropVariant } from "../SidebarStageBackdrop";
import { Button } from "../ui/button";
import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
import { Spinner } from "../ui/spinner";
@@ -71,6 +72,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
const pointerFocusProps = preserveComposerFocusOnPointerDown
? { onPointerDown: preventPointerFocus }
: undefined;
+ const stageBackdropVariant = useSidebarStageBackdropVariant();
if (pendingAction) {
return (
@@ -196,7 +198,12 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
return (
<button
type="submit"
- className="flex h-9 w-9 enabled:cursor-pointer items-center justify-center rounded-full bg-primary/90 text-primary-foreground shadow-xs enabled:shadow-primary/24 enabled:inset-shadow-[0_1px_--theme(--color-white/16%)] transition-all duration-150 hover:bg-primary hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none disabled:pointer-events-none disabled:opacity-30 disabled:shadow-none disabled:hover:scale-100 sm:h-8 sm:w-8"
+ className={cn(
+ "relative isolate flex h-9 w-9 items-center justify-center overflow-hidden rounded-full text-primary-foreground shadow-xs transition-all duration-150 enabled:cursor-pointer enabled:inset-shadow-[0_1px_--theme(--color-white/16%)] hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none disabled:pointer-events-none disabled:opacity-30 disabled:shadow-none disabled:hover:scale-100 sm:h-8 sm:w-8",
+ stageBackdropVariant
+ ? "bg-transparent enabled:shadow-black/24 enabled:hover:brightness-110"
+ : "bg-primary/90 enabled:shadow-primary/24 hover:bg-primary",
+ )}
{...pointerFocusProps}
disabled={isSendBusy || isConnecting || isEnvironmentUnavailable || !hasSendableContent}
aria-label={
@@ -211,6 +218,11 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
: "Send message"
}
>
+ {stageBackdropVariant ? (
+ <span className="absolute inset-0 -z-10" aria-hidden="true">
+ <StageBackdropButtonArt variant={stageBackdropVariant} />
+ </span>
+ ) : null}
{isConnecting || isSendBusy ? (
<Spinner className="size-3.5" aria-hidden="true" />
) : (
diff --git a/apps/web/src/components/chat/ContextWindowMeter.tsx b/apps/web/src/components/chat/ContextWindowMeter.tsx
index 8c0ec932d..4223ce862 100644
--- a/apps/web/src/components/chat/ContextWindowMeter.tsx
+++ b/apps/web/src/components/chat/ContextWindowMeter.tsx
@@ -25,7 +25,9 @@ export function ContextWindowMeter(props: {
const totalProcessedTokens = usage.totalProcessedTokens ?? null;
const showTotalProcessed = totalProcessedTokens !== null && totalProcessedTokens > 0;
const isOverloaded = normalizedPercentage > 90;
- const usageColor = isOverloaded ? "var(--color-red-500)" : "var(--color-blue-500)";
+ const usageColor = isOverloaded
+ ? "var(--color-red-500)"
+ : "color-mix(in oklab, var(--color-muted-foreground) 72%, transparent)";
return (
<Popover>
@@ -37,7 +39,7 @@ export function ContextWindowMeter(props: {
<button
type="button"
className={cn(
- "inline-flex size-6 cursor-pointer items-center justify-center rounded-full border border-transparent text-muted-foreground outline-none transition-colors",
+ "inline-flex size-7 cursor-pointer items-center justify-center rounded-full border border-transparent text-muted-foreground outline-none transition-colors",
"hover:bg-accent data-[pressed]:bg-accent",
"focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background",
)}
@@ -47,7 +49,7 @@ export function ContextWindowMeter(props: {
: `Context window ${formatContextWindowTokens(usage.usedTokens)} tokens used`
}
>
- <span className="relative flex size-4 items-center justify-center">
+ <span className="relative flex size-5 items-center justify-center">
<svg
viewBox="0 0 24 24"
className="-rotate-90 absolute inset-0 size-full transform-gpu"
@@ -58,7 +60,7 @@ export function ContextWindowMeter(props: {
cy="12"
r={radius}
fill="none"
- stroke="color-mix(in oklab, var(--color-muted-foreground) 35%, transparent)"
+ stroke="color-mix(in oklab, var(--color-muted-foreground) 24%, transparent)"
strokeWidth="3"
/>
<circle
@@ -78,7 +80,12 @@ export function ContextWindowMeter(props: {
</button>
}
/>
- <PopoverPopup tooltipStyle side="top" align="end" className="w-64 max-w-none p-0">
+ <PopoverPopup
+ tooltipStyle
+ side="top"
+ align="end"
+ className="dropdown-glass w-64 max-w-none border-0! bg-secondary! p-0 shadow-none! before:hidden"
+ >
<div className="flex flex-col gap-2 p-3">
<div className="flex items-center justify-between gap-3">
<div className="font-medium text-muted-foreground text-xs">Context Window</div>
diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsx
index b340a248f..24acb2822 100644
--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx
@@ -219,6 +219,23 @@ function buildUserTimelineEntry(text: string) {
}
describe("MessagesTimeline", () => {
+ it("uses the larger leading inset only when the top fade is enabled", async () => {
+ const { MessagesTimeline } = await import("./MessagesTimeline");
+ const timelineEntries = [buildUserTimelineEntry("Hello")];
+
+ const compactMarkup = renderToStaticMarkup(
+ <MessagesTimeline {...buildProps()} timelineEntries={timelineEntries} />,
+ );
+ const fadedMarkup = renderToStaticMarkup(
+ <MessagesTimeline {...buildProps()} timelineEntries={timelineEntries} topFadeEnabled />,
+ );
+
+ expect(compactMarkup).toContain('class="h-3 sm:h-4"');
+ expect(compactMarkup).not.toContain("chat-timeline-scroll-fade");
+ expect(fadedMarkup).toContain('class="h-10 sm:h-12"');
+ expect(fadedMarkup).toContain("chat-timeline-scroll-fade");
+ });
+
it("keeps assistant changed-files headers sticky below the thread header", async () => {
const { MessagesTimeline } = await import("./MessagesTimeline");
const assistantMessageId = MessageId.make("message-assistant-with-files");
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index f759aa150..bb477fb7d 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -150,6 +150,7 @@ interface TimelineRowActivityState {
const TimelineRowCtx = createContext<TimelineRowSharedState>(null!);
const TimelineRowActivityCtx = createContext<TimelineRowActivityState>(null!);
const TIMELINE_LIST_HEADER = <div className="h-3 sm:h-4" />;
+const TIMELINE_LIST_FADE_HEADER = <div className="h-10 sm:h-12" />;
const TIMELINE_LIST_FOOTER = <div className="h-3 sm:h-4" />;
const EMPTY_TIMELINE_SKILLS: ReadonlyArray<Pick<ServerProviderSkill, "name" | "displayName">> = [];
@@ -185,6 +186,7 @@ interface MessagesTimelineProps {
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
+ topFadeEnabled?: boolean;
}
// ---------------------------------------------------------------------------
@@ -219,6 +221,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
+ topFadeEnabled = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
@@ -510,8 +513,11 @@ export const MessagesTimeline = memo(function MessagesTimeline({
size: false,
}}
onScroll={handleScroll}
- className="scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain px-3 [overflow-anchor:none] sm:px-5"
- ListHeaderComponent={TIMELINE_LIST_HEADER}
+ className={cn(
+ "scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain px-3 [overflow-anchor:none] sm:px-5",
+ topFadeEnabled && "chat-timeline-scroll-fade",
+ )}
+ ListHeaderComponent={topFadeEnabled ? TIMELINE_LIST_FADE_HEADER : TIMELINE_LIST_HEADER}
ListFooterComponent={TIMELINE_LIST_FOOTER}
/>
<TimelineMinimap
@@ -797,7 +803,7 @@ function TimelineMinimap({
transform: `translateY(${activeTooltipTranslate})`,
}}
>
- <span className="block rounded-xl border border-border/70 bg-popover/95 p-3 text-left text-popover-foreground shadow-xl shadow-black/25 backdrop-blur">
+ <span className="dropdown-glass block rounded-xl p-3 text-left text-popover-foreground shadow-xl shadow-black/25">
<span className="block max-w-full overflow-hidden text-ellipsis whitespace-nowrap text-sm font-medium leading-5">
{activeItem.userText ?? "User message"}
</span>
@@ -886,7 +892,7 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
return (
<div className="group flex flex-col items-end gap-1">
- <div className="relative max-w-[80%] rounded-2xl border border-border bg-secondary p-3">
+ <div className="relative max-w-[80%] rounded-2xl bg-secondary p-3">
{regularImages.length > 0 && (
<div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
{regularImages.map((image: NonNullable<TimelineMessage["attachments"]>[number]) => (
@@ -1279,7 +1285,7 @@ function AssistantChangedFilesSectionInner({
const summaryStat = summarizeTurnDiffStats(checkpointFiles);
return (
- <div className="mt-4 rounded-2xl border border-input bg-background p-2 pt-4 shadow-xs/5 not-dark:bg-clip-padding dark:bg-input/32">
+ <div className="mt-4 rounded-2xl bg-background p-2 pt-4 shadow-xs/5 not-dark:bg-clip-padding dark:bg-input/32">
<div className="sticky top-2 z-10 mb-3 flex items-center justify-between gap-2 bg-background px-2 before:absolute before:inset-x-0 before:-top-4 before:h-4 before:bg-background before:content-[''] dark:bg-[color-mix(in_srgb,var(--foreground)_2.5%,var(--background))] dark:before:bg-[color-mix(in_srgb,var(--foreground)_2.5%,var(--background))]">
<p className="flex items-center gap-1 whitespace-nowrap font-medium text-foreground text-xs leading-4">
<span>
diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsx
index 3f8915e5d..c62e0639d 100644
--- a/apps/web/src/components/chat/ModelListRow.tsx
+++ b/apps/web/src/components/chat/ModelListRow.tsx
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
-import { CheckIcon, StarIcon } from "lucide-react";
+import { StarIcon } from "lucide-react";
import {
getDisplayModelName,
getTriggerDisplayModelLabel,
@@ -51,7 +51,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
contentClassName="flex w-full items-center gap-3"
className={cn(
"group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
- "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
+ "data-highlighted:bg-muted/56 data-selected:bg-foreground/[0.08] data-selected:text-foreground data-selected:ring-0",
props.disabledReason &&
"data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
)}
@@ -66,7 +66,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
props.preferShortName ? { preferShortName: true } : undefined,
)}
</div>
- {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
{props.showNewBadge ? (
<span
className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
diff --git a/apps/web/src/components/chat/ModelPickerContent.tsx b/apps/web/src/components/chat/ModelPickerContent.tsx
index 9c72f15f9..8af23b530 100644
--- a/apps/web/src/components/chat/ModelPickerContent.tsx
+++ b/apps/web/src/components/chat/ModelPickerContent.tsx
@@ -521,7 +521,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
return (
<TooltipProvider delay={0}>
<div
- className="relative flex h-screen max-h-96 w-screen max-w-100 flex-row overflow-hidden rounded-lg border bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:border-transparent dark:shadow-none dark:inset-ring-1 dark:inset-ring-white/5 dark:before:shadow-none"
+ className="dropdown-glass model-picker-surface relative flex h-screen max-h-96 w-screen max-w-100 flex-row overflow-hidden rounded-xl text-popover-foreground"
data-model-picker-content="true"
>
{/* Sidebar */}
@@ -568,15 +568,10 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
handleModelSelect(slug, instanceId);
}}
>
- <div
- className={cn(
- "flex min-h-0 flex-1 flex-col overflow-hidden bg-muted/40",
- showSidebar && "border-l",
- )}
- >
+ <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
{/* Search bar */}
<div className="px-4 pt-2.5">
- <div className="-translate-y-px border-b border-border/70 pb-2.5 transition-colors focus-within:border-ring">
+ <div className="-translate-y-px rounded-lg bg-accent px-2 py-1">
<ComboboxInput
ref={searchInputRef}
className="[&_input]:h-6.5 [&_input]:font-sans [&_input]:leading-6.5"
diff --git a/apps/web/src/components/chat/ModelPickerSidebar.tsx b/apps/web/src/components/chat/ModelPickerSidebar.tsx
index e5555cb01..fe2b840ca 100644
--- a/apps/web/src/components/chat/ModelPickerSidebar.tsx
+++ b/apps/web/src/components/chat/ModelPickerSidebar.tsx
@@ -97,10 +97,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
}, [props.instanceEntries, props.selectedInstanceId, showFavorites]);
return (
- <div
- className="w-12 shrink-0 overflow-hidden border-r bg-muted/30"
- data-model-picker-sidebar="true"
- >
+ <div className="w-12 shrink-0 overflow-hidden bg-muted/60" data-model-picker-sidebar="true">
<div className="h-full overflow-y-auto overscroll-contain [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
<div
ref={sidebarContentRef}
@@ -118,7 +115,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
) : null}
{/* Favorites section */}
{showFavorites ? (
- <div className="mb-1 border-b pb-1">
+ <div className="mb-1 pb-1">
<div className="relative w-full">
<Tooltip>
<TooltipTrigger
diff --git a/apps/web/src/components/chat/ProviderStatusBanner.tsx b/apps/web/src/components/chat/ProviderStatusBanner.tsx
index c725b3e27..205157008 100644
--- a/apps/web/src/components/chat/ProviderStatusBanner.tsx
+++ b/apps/web/src/components/chat/ProviderStatusBanner.tsx
@@ -27,7 +27,7 @@ export const ProviderStatusBanner = memo(function ProviderStatusBanner({
: `${providerName} provider has limited availability.`));
return (
- <div className="mx-auto w-fit max-w-[calc(100%-2rem)] pt-3">
+ <div className="pointer-events-auto mx-auto w-fit max-w-[calc(100%-2rem)] pt-3">
<div
className={cn(
"inline-flex items-center gap-3 rounded-xl border px-3.5 py-3 text-card-foreground text-sm",
diff --git a/apps/web/src/components/chat/TraitsPicker.tsx b/apps/web/src/components/chat/TraitsPicker.tsx
index 714ee4239..60f7f828a 100644
--- a/apps/web/src/components/chat/TraitsPicker.tsx
+++ b/apps/web/src/components/chat/TraitsPicker.tsx
@@ -16,7 +16,7 @@ import {
} from "@t3tools/shared/model";
import { memo, useCallback, useState } from "react";
import type { VariantProps } from "class-variance-authority";
-import { CheckIcon, ChevronDownIcon } from "lucide-react";
+import { ChevronDownIcon } from "lucide-react";
import { Button, buttonVariants } from "../ui/button";
import {
Menu,
@@ -337,9 +337,6 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
</>
) : null}
</span>
- {option.id === selectedValue ? (
- <CheckIcon className="size-3.5 shrink-0 text-blue-400" />
- ) : null}
</span>
</MenuRadioItem>
))}
@@ -370,9 +367,6 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
<MenuRadioItem key={value} value={value} hideIndicator>
<span className="flex w-full min-w-0 items-center justify-between gap-3">
<span>{value === "on" ? "On" : "Off"}</span>
- {value === selectedValue ? (
- <CheckIcon className="size-3.5 shrink-0 text-blue-400" />
- ) : null}
</span>
</MenuRadioItem>
))}
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index 734a4e373..52b895301 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -373,7 +373,7 @@ function formatDesktopSshConnectionError(error: unknown): string {
return withoutTaggedErrorPrefix.trim() || fallback;
}
-const ENDPOINT_ROW_CLASSNAME = "border-t border-border/60 px-4 py-2.5 first:border-t-0 sm:px-5";
+const ENDPOINT_ROW_CLASSNAME = "rounded-xl px-3 py-2.5 sm:px-4";
type AccessSectionPresentation = "current" | "endpoint-rail";
@@ -383,10 +383,7 @@ function accessRowClassName(_presentation: AccessSectionPresentation) {
function endpointRowClassName(presentation: AccessSectionPresentation, isAvailable: boolean) {
if (presentation === "endpoint-rail") {
- return cn(
- "relative border-t border-border/60 px-4 py-3 first:border-t-0 sm:px-5",
- !isAvailable && "bg-muted/20",
- );
+ return cn("relative rounded-xl px-3 py-3 sm:px-4", !isAvailable && "bg-muted/15");
}
return cn(ENDPOINT_ROW_CLASSNAME, !isAvailable && "bg-muted/24");
@@ -1524,7 +1521,7 @@ const DesktopSshHostRow = memo(function DesktopSshHostRow({
const buttonLabel = connectingHostAlias === target.alias ? "Adding…" : "Add environment";
return (
- <div className="border-t border-border/60 px-4 py-3 first:border-t-0 sm:px-5">
+ <div className="rounded-xl px-3 py-3 sm:px-4">
<div className={ITEM_ROW_INNER_CLASSNAME}>
<div className="min-w-0 flex-1">
<h3 className="truncate text-sm font-medium text-foreground">{target.alias}</h3>
diff --git a/apps/web/src/components/settings/ProviderInstanceCard.tsx b/apps/web/src/components/settings/ProviderInstanceCard.tsx
index ac2f7be81..2a691943d 100644
--- a/apps/web/src/components/settings/ProviderInstanceCard.tsx
+++ b/apps/web/src/components/settings/ProviderInstanceCard.tsx
@@ -531,7 +531,7 @@ export function ProviderInstanceCard({
const titleHeadNode = (
<>
{titleIconNode}
- <h3 className="truncate text-[13px] font-semibold tracking-[-0.01em] text-foreground">
+ <h3 className="truncate text-sm font-medium tracking-[-0.005em] text-foreground">
{displayName}
</h3>
{String(instanceId) !== String(instance.driver) ? (
@@ -578,7 +578,7 @@ export function ProviderInstanceCard({
);
const authRowNode = (
- <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-xs text-muted-foreground/80">
+ <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-[13px] leading-[1.45] text-muted-foreground/80">
{hasAuthenticatedEmail ? (
<>
<span>Authenticated as</span>
@@ -600,8 +600,8 @@ export function ProviderInstanceCard({
) : null;
return (
- <div className="border-t border-border/60 first:border-t-0">
- <div className="px-4 py-3.5 sm:px-5">
+ <div className="rounded-xl transition-colors hover:bg-muted/20">
+ <div className="px-3 py-3 sm:px-4">
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div className="min-w-0 flex-1 space-y-1">
<div className="flex min-w-0 flex-wrap items-center gap-2">
@@ -729,8 +729,8 @@ export function ProviderInstanceCard({
<Collapsible open={isExpanded} onOpenChange={onExpandedChange}>
<CollapsibleContent>
- <div className="space-y-0">
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">
+ <div className="space-y-5 px-3 pb-4 pt-2 sm:px-4">
+ <div>
<label htmlFor={`provider-instance-${instanceId}-display-name`} className="block">
<span className="text-xs font-medium text-foreground">Display name</span>
<DraftInput
@@ -747,7 +747,7 @@ export function ProviderInstanceCard({
</label>
</div>
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">
+ <div>
<ProviderAccentColorPicker
displayName={displayName}
value={accentColor}
@@ -757,7 +757,7 @@ export function ProviderInstanceCard({
/>
</div>
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">
+ <div>
<ProviderEnvironmentSection
environment={instance.environment ?? []}
onChange={updateEnvironment}
@@ -789,7 +789,7 @@ export function ProviderInstanceCard({
onModelOrderChange={onModelOrderChange}
/>
) : (
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">
+ <div>
<p className="text-xs text-muted-foreground">
This instance uses a driver (
<code className="text-foreground">{String(instance.driver)}</code>) that is not
diff --git a/apps/web/src/components/settings/ProviderModelsSection.tsx b/apps/web/src/components/settings/ProviderModelsSection.tsx
index 27d139975..7ae26b278 100644
--- a/apps/web/src/components/settings/ProviderModelsSection.tsx
+++ b/apps/web/src/components/settings/ProviderModelsSection.tsx
@@ -185,7 +185,7 @@ export function ProviderModelsSection({
};
return (
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">
+ <div>
<div className="text-xs font-medium text-foreground">Models</div>
<div className="mt-1 text-xs text-muted-foreground">
{models.length} model{models.length === 1 ? "" : "s"} available.
diff --git a/apps/web/src/components/settings/ProviderSettingsForm.tsx b/apps/web/src/components/settings/ProviderSettingsForm.tsx
index 83dc7d068..cd34bb35c 100644
--- a/apps/web/src/components/settings/ProviderSettingsForm.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsForm.tsx
@@ -167,7 +167,7 @@ function FieldFrame(props: {
readonly children: ReactNode;
}) {
if (props.variant === "card") {
- return <div className="border-t border-border/60 px-4 py-3 sm:px-5">{props.children}</div>;
+ return <div>{props.children}</div>;
}
return <div className="grid gap-1.5">{props.children}</div>;
}
diff --git a/apps/web/src/components/settings/SettingsSidebarNav.tsx b/apps/web/src/components/settings/SettingsSidebarNav.tsx
index c6b45e7c3..ebbd1b1e4 100644
--- a/apps/web/src/components/settings/SettingsSidebarNav.tsx
+++ b/apps/web/src/components/settings/SettingsSidebarNav.tsx
@@ -18,7 +18,6 @@ import {
SidebarMenu,
SidebarMenuButton,
SidebarMenuItem,
- SidebarSeparator,
useSidebar,
} from "../ui/sidebar";
import { T3ConnectSidebarAvatar, T3ConnectSidebarSignIn } from "../clerk/T3ConnectSidebarSignIn";
@@ -85,8 +84,8 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
isActive={isActive}
className={
isActive
- ? "gap-2.5 px-2.5 py-2 text-left text-[13px] font-medium text-sidebar-foreground"
- : "gap-2.5 px-2.5 py-2 text-left text-[13px] text-sidebar-muted-foreground hover:text-sidebar-foreground"
+ ? "h-8 items-center gap-2 rounded-md bg-sidebar-row-active px-2 py-1.5 text-left text-sm font-medium text-sidebar-foreground"
+ : "h-8 items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm font-medium text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
}
onClick={() => handleSectionClick(item.to)}
>
@@ -94,7 +93,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
className={
isActive
? "size-4 shrink-0 text-sidebar-foreground"
- : "size-4 shrink-0 text-sidebar-muted-foreground"
+ : "size-4 shrink-0 text-sidebar-muted-foreground/60"
}
/>
<span className="truncate">{item.label}</span>
@@ -105,8 +104,6 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
</SidebarMenu>
</SidebarGroup>
</SidebarContent>
-
- <SidebarSeparator />
<SidebarFooter className="p-2">
<T3ConnectSidebarSignIn />
<div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-1">
@@ -114,7 +111,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
<SidebarMenuItem>
<SidebarMenuButton
size="sm"
- className="gap-2 px-2 py-2 text-xs text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
+ className="h-8 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
onClick={handleBackClick}
>
<ArrowLeftIcon className="size-4" />
diff --git a/apps/web/src/components/settings/SourceControlSettings.tsx b/apps/web/src/components/settings/SourceControlSettings.tsx
index b6d23de4f..e0387f197 100644
--- a/apps/web/src/components/settings/SourceControlSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlSettings.tsx
@@ -229,16 +229,16 @@ function DiscoveryItemRow({
return (
<div
className={cn(
- "border-t border-border/60 first:border-t-0",
+ "rounded-xl transition-colors hover:bg-muted/20",
isVcsNotReady(item) && "opacity-80",
)}
>
- <div className="px-4 py-3.5 sm:px-5">
+ <div className="px-3 py-3 sm:px-4">
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div className="min-w-0 flex-1 space-y-1">
<div className="flex min-w-0 flex-wrap items-center gap-2">
<SourceControlItemMark item={item} />
- <span className="truncate text-[13px] font-semibold tracking-[-0.01em] text-foreground">
+ <span className="truncate text-sm font-medium tracking-[-0.005em] text-foreground">
{item.label}
</span>
{version ? <code className="text-xs text-muted-foreground">{version}</code> : null}
@@ -253,7 +253,7 @@ function DiscoveryItemRow({
</Badge>
) : null}
</div>
- <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-xs text-muted-foreground/80">
+ <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-[13px] leading-[1.45] text-muted-foreground/80">
{itemSummary({ item, auth, authAccount })}
</p>
</div>
@@ -282,7 +282,7 @@ function DiscoveryItemRow({
{hasDetails ? (
<Collapsible open={isExpanded} onOpenChange={setIsExpanded}>
<CollapsibleContent>
- <div className="border-t border-border/60 px-4 py-3 sm:px-5">{children}</div>
+ <div className="px-3 pb-4 pt-1 sm:px-4">{children}</div>
</CollapsibleContent>
</Collapsible>
) : null}
@@ -368,7 +368,7 @@ function SourceControlSectionSkeleton({
return (
<SettingsSection title={title} headerAction={headerAction}>
{SOURCE_CONTROL_SKELETON_ROWS.map((row) => (
- <div key={row} className="border-t border-border/60 px-4 py-3.5 first:border-t-0 sm:px-5">
+ <div key={row} className="rounded-xl px-3 py-3 sm:px-4">
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div className="min-w-0 flex-1 space-y-2">
<div className="flex items-center gap-2">
diff --git a/apps/web/src/components/settings/itemRows.ts b/apps/web/src/components/settings/itemRows.ts
index df0f1f7c2..e207c9ff7 100644
--- a/apps/web/src/components/settings/itemRows.ts
+++ b/apps/web/src/components/settings/itemRows.ts
@@ -1,5 +1,5 @@
-/** Direct row in the card – same pattern as the Provider / ACP-agent list rows. */
-export const ITEM_ROW_CLASSNAME = "border-t border-border/60 px-4 py-4 first:border-t-0 sm:px-5";
+/** Direct row in a settings section. Whitespace, rather than rules, separates peers. */
+export const ITEM_ROW_CLASSNAME = "rounded-xl px-3 py-3 sm:px-4";
export const ITEM_ROW_INNER_CLASSNAME =
"flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between";
diff --git a/apps/web/src/components/settings/settingsLayout.tsx b/apps/web/src/components/settings/settingsLayout.tsx
index 04c1816f6..4572a1b70 100644
--- a/apps/web/src/components/settings/settingsLayout.tsx
+++ b/apps/web/src/components/settings/settingsLayout.tsx
@@ -29,18 +29,15 @@ export function SettingsSection({
children: ReactNode;
}) {
return (
- <section {...sectionProps} className={cn("space-y-2.5", className)}>
- <div className="flex items-center justify-between px-1">
- <h2 className="flex items-center gap-2 text-[11px] font-semibold uppercase tracking-[0.08em] text-foreground/50">
- <span className="inline-block h-px w-3 bg-border" aria-hidden />
+ <section {...sectionProps} className={cn("space-y-3", className)}>
+ <div className="flex min-h-8 items-center justify-between gap-4 px-3 sm:px-4">
+ <h2 className="flex items-center gap-2 text-lg font-semibold tracking-[-0.025em] text-foreground">
{icon}
{title}
</h2>
- <div className="flex h-5 min-w-5 items-center justify-end">{headerAction}</div>
- </div>
- <div className="relative overflow-visible rounded-2xl border bg-surface-raised text-card-foreground shadow-sm/4 not-dark:bg-clip-padding before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:shadow-none dark:before:shadow-[0_-1px_--theme(--color-white/6%)]">
- {children}
+ <div className="flex min-h-7 min-w-7 items-center justify-end">{headerAction}</div>
</div>
+ <div className="relative space-y-1 overflow-visible text-foreground">{children}</div>
</section>
);
}
@@ -65,24 +62,20 @@ export function SettingsRow({
return (
<div
{...rowProps}
- className={cn(
- "border-t border-border/60 px-4 first:border-t-0 sm:px-5",
- children ? "pt-3.5 pb-0" : "py-3.5",
- className,
- )}
+ className={cn("rounded-xl px-3 sm:px-4", children ? "pt-3 pb-1" : "py-3", className)}
>
- <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+ <div className="flex flex-col gap-3 sm:grid sm:grid-cols-[minmax(0,1fr)_minmax(10rem,auto)] sm:items-center sm:gap-8">
<div className="min-w-0 flex-1 space-y-1">
<div className="flex min-h-5 items-center gap-1.5">
- <h3 className="text-[13px] font-semibold tracking-[-0.01em] text-foreground">
- {title}
- </h3>
+ <h3 className="text-sm font-medium tracking-[-0.005em] text-foreground">{title}</h3>
<span className="inline-flex h-5 w-5 shrink-0 items-center justify-center">
{resetAction}
</span>
</div>
- <p className="text-xs text-muted-foreground/80">{description}</p>
- {status ? <div className="pt-0.5 text-[11px] text-muted-foreground">{status}</div> : null}
+ <p className="max-w-xl text-[13px] leading-[1.45] text-muted-foreground/80">
+ {description}
+ </p>
+ {status ? <div className="pt-0.5 text-xs text-muted-foreground">{status}</div> : null}
</div>
{control ? (
<div className="flex w-full shrink-0 items-center gap-2 sm:w-auto sm:justify-end">
@@ -127,8 +120,8 @@ export function SettingsPageContainer({
className?: string;
}) {
return (
- <div className="scrollbar-gutter-both flex-1 overflow-y-auto p-6 sm:p-8">
- <div className={cn("mx-auto flex w-full max-w-3xl flex-col gap-8", className)}>
+ <div className="scrollbar-gutter-both flex-1 overflow-y-auto px-4 py-7 sm:px-8 sm:py-10">
+ <div className={cn("mx-auto flex w-full max-w-4xl flex-col gap-12", className)}>
{children}
</div>
</div>
diff --git a/apps/web/src/components/sidebar/SidebarChrome.tsx b/apps/web/src/components/sidebar/SidebarChrome.tsx
index c338aee2f..8c3527807 100644
--- a/apps/web/src/components/sidebar/SidebarChrome.tsx
+++ b/apps/web/src/components/sidebar/SidebarChrome.tsx
@@ -115,10 +115,10 @@ export const SidebarChromeFooter = memo(function SidebarChromeFooter() {
<SidebarMenuItem>
<SidebarMenuButton
size="sm"
- className="gap-2 px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
+ className="h-8 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
onClick={handleSettingsClick}
>
- <SettingsIcon className="size-4 shrink-0" />
+ <SettingsIcon className="size-4.5 shrink-0" />
<span>Settings</span>
</SidebarMenuButton>
</SidebarMenuItem>
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index f6d09f779..428aaa91e 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -40,7 +40,7 @@ const buttonVariants = cva(
"border-transparent text-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [&_svg:not([class*='text-'])]:text-muted-foreground",
link: "border-transparent underline-offset-4 [:hover,[data-pressed]]:underline",
outline:
- "border-input bg-popover not-dark:bg-clip-padding text-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-accent/50 dark:[:hover,[data-pressed]]:bg-input/64 [&_svg:not([class*='text-'])]:text-muted-foreground",
+ "border-transparent bg-popover not-dark:bg-clip-padding text-foreground shadow-none dark:bg-input/32 [:hover,[data-pressed]]:bg-accent/50 dark:[:hover,[data-pressed]]:bg-input/64 [&_svg:not([class*='text-'])]:text-muted-foreground",
secondary:
"border-transparent bg-secondary text-secondary-foreground [:active,[data-pressed]]:bg-secondary/80 [:hover,[data-pressed]]:bg-secondary/90",
},
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index 672b38823..421eaa030 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -1,7 +1,7 @@
"use client";
import { Combobox as ComboboxPrimitive } from "@base-ui/react/combobox";
-import { CheckIcon, ChevronsUpDownIcon, XIcon } from "lucide-react";
+import { ChevronsUpDownIcon, XIcon } from "lucide-react";
import * as React from "react";
import { cn } from "~/lib/utils";
@@ -170,7 +170,7 @@ function ComboboxPopup({
>
<span
className={cn(
- "relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "dropdown-glass relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg transition-[scale,opacity]",
className,
)}
>
@@ -191,7 +191,7 @@ function ComboboxItem({
className,
contentClassName,
children,
- hideIndicator = false,
+ hideIndicator: _hideIndicator = false,
...props
}: ComboboxPrimitive.Item.Props & {
contentClassName?: string;
@@ -200,19 +200,15 @@ function ComboboxItem({
return (
<ComboboxPrimitive.Item
className={cn(
- "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default grid-cols-[1rem_1fr] items-center gap-2 rounded-sm py-1 ps-2 pe-4 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-foreground/[0.08] data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="combobox-item"
{...props}
>
- <ComboboxPrimitive.ItemIndicator className={cn("col-start-1", hideIndicator && "hidden")}>
- <CheckIcon />
- </ComboboxPrimitive.ItemIndicator>
<div
className={cn(
- "[&_svg:not([class*='text-'])]:text-muted-foreground",
- hideIndicator ? "col-start-1 col-span-full" : "col-start-2",
+ "min-w-0 flex-1 [&_svg:not([class*='text-'])]:text-muted-foreground",
contentClassName,
)}
data-slot="combobox-item-content"
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index 7864fe445..90aa7328c 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -30,7 +30,7 @@ function CommandDialogBackdrop({ className, ...props }: CommandDialogPrimitive.B
return (
<CommandDialogPrimitive.Backdrop
className={cn(
- "fixed inset-0 z-50 bg-background/60 backdrop-blur-xs transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
+ "fixed inset-0 z-50 bg-black/40 transition-opacity duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
className,
)}
data-slot="command-dialog-backdrop"
@@ -66,7 +66,7 @@ function CommandDialogPopup({
<CommandDialogViewport>
<CommandDialogPrimitive.Popup
className={cn(
- "pointer-events-auto -translate-y-[calc(1.25rem*var(--nested-dialogs))] relative row-start-2 flex max-h-105 min-h-0 w-full min-w-0 max-w-xl scale-[calc(1-0.1*var(--nested-dialogs))] flex-col rounded-2xl border bg-popover not-dark:bg-clip-padding text-popover-foreground opacity-[calc(1-0.1*var(--nested-dialogs))] shadow-lg/5 outline-none transition-[scale,opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:bg-muted/72 before:shadow-[0_1px_--theme(--color-black/4%)] data-nested:data-ending-style:translate-y-8 data-nested:data-starting-style:translate-y-8 data-nested-dialog-open:origin-top data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 **:data-[slot=scroll-area-viewport]:data-has-overflow-y:pe-1 dark:border-transparent dark:shadow-none dark:inset-ring-1 dark:inset-ring-white/5 dark:before:shadow-none",
+ "chat-composer-glass command-palette-glass pointer-events-auto -translate-y-[calc(1.25rem*var(--nested-dialogs))] relative row-start-2 flex max-h-105 min-h-0 w-full min-w-0 max-w-xl scale-[calc(1-0.1*var(--nested-dialogs))] flex-col rounded-2xl text-foreground opacity-[calc(1-0.1*var(--nested-dialogs))] outline-none transition-[scale,opacity,translate] duration-200 ease-in-out will-change-transform data-nested:data-ending-style:translate-y-8 data-nested:data-starting-style:translate-y-8 data-nested-dialog-open:origin-top data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 **:data-[slot=scroll-area-viewport]:data-has-overflow-y:pe-1",
className,
)}
data-slot="command-dialog-popup"
@@ -144,7 +144,7 @@ function CommandPanel({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
className={cn(
- "-mx-px not-has-[+[data-slot=command-footer]]:-mb-px relative min-h-0 overflow-hidden rounded-t-xl not-has-[+[data-slot=command-footer]]:rounded-b-2xl border border-b-0 bg-popover bg-clip-padding shadow-xs/5 [clip-path:inset(0_1px)] not-has-[+[data-slot=command-footer]]:[clip-path:inset(0_1px_1px_1px_round_0_0_calc(var(--radius-2xl)-1px)_calc(var(--radius-2xl)-1px))] before:pointer-events-none before:absolute before:inset-0 before:rounded-t-[calc(var(--radius-xl)-1px)] **:data-[slot=scroll-area-scrollbar]:mt-2 [touch-action:pan-y] dark:border-white/5 dark:shadow-none",
+ "relative min-h-0 overflow-hidden rounded-t-xl not-has-[+[data-slot=command-footer]]:rounded-b-2xl bg-transparent **:data-[slot=scroll-area-scrollbar]:mt-2 [touch-action:pan-y]",
className,
)}
{...props}
@@ -171,7 +171,14 @@ function CommandCollection({ ...props }: React.ComponentProps<typeof Autocomplet
function CommandItem({ className, ...props }: React.ComponentProps<typeof AutocompleteItem>) {
return (
- <AutocompleteItem className={cn("py-1.5", className)} data-slot="command-item" {...props} />
+ <AutocompleteItem
+ className={cn(
+ "py-1.5 data-selected:bg-foreground/[0.06] data-highlighted:bg-foreground/[0.09] data-highlighted:text-foreground [&[data-highlighted][data-selected]]:bg-foreground/[0.09] [&[data-highlighted][data-selected]]:text-foreground",
+ className,
+ )}
+ data-slot="command-item"
+ {...props}
+ />
);
}
@@ -205,7 +212,7 @@ function CommandFooter({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
className={cn(
- "relative flex items-center justify-between gap-2 rounded-b-[calc(var(--radius-2xl)-1px)] border-t border-zinc-200/80 px-5 py-3 font-medium text-sm text-zinc-700 dark:border-white/8 dark:text-zinc-300 [&_[data-slot=kbd-group]]:font-sans [&_[data-slot=kbd]]:bg-zinc-100 [&_[data-slot=kbd]]:text-zinc-900 [&_[data-slot=kbd]]:ring-1 [&_[data-slot=kbd]]:ring-zinc-200/80 [&_[data-slot=kbd]]:dark:bg-zinc-800 [&_[data-slot=kbd]]:dark:text-zinc-100 [&_[data-slot=kbd]]:dark:ring-zinc-700",
+ "relative flex items-center justify-between gap-2 rounded-b-[calc(var(--radius-2xl)-1px)] bg-foreground/[0.025] px-5 py-3 font-medium text-sm text-muted-foreground [&_[data-slot=kbd-group]]:font-sans [&_[data-slot=kbd]]:bg-foreground/[0.08] [&_[data-slot=kbd]]:text-foreground [&_[data-slot=kbd]]:ring-0",
className,
)}
data-slot="command-footer"
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index e9ee42c8f..655663513 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -49,7 +49,7 @@ function MenuPopup({
>
<MenuPrimitive.Popup
className={cn(
- "relative flex not-[class*='w-']:min-w-32 origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 outline-none before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] focus:outline-none dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "dropdown-glass relative flex not-[class*='w-']:min-w-32 origin-(--transform-origin) rounded-lg outline-none focus:outline-none",
className,
)}
data-slot="menu-popup"
@@ -150,7 +150,7 @@ function MenuRadioGroup(props: MenuPrimitive.RadioGroup.Props) {
function MenuRadioItem({
className,
children,
- hideIndicator = false,
+ hideIndicator: _hideIndicator = false,
...props
}: MenuPrimitive.RadioItem.Props & {
hideIndicator?: boolean;
@@ -158,31 +158,13 @@ function MenuRadioItem({
return (
<MenuPrimitive.RadioItem
className={cn(
- "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center gap-2 rounded-sm py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- hideIndicator ? "grid-cols-[1fr] ps-3 pe-3" : "grid-cols-[1rem_1fr] ps-2 pe-4",
+ "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center rounded-sm px-2 py-1 text-base text-foreground outline-none data-checked:bg-foreground/[0.08] data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="menu-radio-item"
{...props}
>
- {hideIndicator ? null : (
- <MenuPrimitive.RadioItemIndicator className="col-start-1">
- <svg
- fill="none"
- height="24"
- stroke="currentColor"
- strokeLinecap="round"
- strokeLinejoin="round"
- strokeWidth="2"
- viewBox="0 0 24 24"
- width="24"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
- </svg>
- </MenuPrimitive.RadioItemIndicator>
- )}
- <span className={hideIndicator ? "col-start-1" : "col-start-2"}>{children}</span>
+ <span className="min-w-0 flex-1">{children}</span>
</MenuPrimitive.RadioItem>
);
}
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 7761b0359..9c30aa727 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -150,7 +150,7 @@ function SelectPopup({
</SelectPrimitive.ScrollUpArrow>
<div
className={cn(
- "relative h-full rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "dropdown-glass relative h-full rounded-lg",
matchTriggerWidth && "min-w-(--anchor-width)",
popupClassName,
)}
@@ -177,7 +177,7 @@ function SelectPopup({
function SelectItem({
className,
children,
- hideIndicator = false,
+ hideIndicator: _hideIndicator = false,
...props
}: SelectPrimitive.Item.Props & {
hideIndicator?: boolean;
@@ -185,35 +185,14 @@ function SelectItem({
return (
<SelectPrimitive.Item
className={cn(
- "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center gap-2 rounded-sm py-1 text-base outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- hideIndicator ? "grid-cols-[1fr] ps-3 pe-3" : "grid-cols-[1rem_1fr] ps-2 pe-4",
+ "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center rounded-sm px-2 py-1 text-base outline-none data-selected:bg-foreground/[0.08] data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="select-item"
{...props}
>
- {hideIndicator ? null : (
- <SelectPrimitive.ItemIndicator className="col-start-1" data-slot="select-item-indicator">
- <svg
- fill="none"
- height="24"
- stroke="currentColor"
- strokeLinecap="round"
- strokeLinejoin="round"
- strokeWidth="2"
- viewBox="0 0 24 24"
- width="24"
- xmlns="http://www.w3.org/1500/svg"
- >
- <path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
- </svg>
- </SelectPrimitive.ItemIndicator>
- )}
<SelectPrimitive.ItemText
- className={cn(
- "min-w-0 [&_svg:not([class*='text-'])]:text-muted-foreground",
- hideIndicator ? "col-start-1" : "col-start-2",
- )}
+ className="min-w-0 flex-1 [&_svg:not([class*='text-'])]:text-muted-foreground"
data-slot="select-item-text"
>
{children}
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 8649e07e4..44373c2b5 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -107,7 +107,6 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
}
@theme inline {
- --color-zinc-25: oklch(99.2% 0 0);
--animate-skeleton: skeleton 2s -1s infinite linear;
/* Duty-cycled indicator animations: long holds with stepped ramps, so the
compositor updates discrete frames instead of every vsync. */
@@ -303,6 +302,46 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
align-items: center;
}
+ /* Fade rows themselves as they pass beneath the top chrome. A mask remains
+ visible even when the header and timeline share the same background. */
+ .chat-timeline-scroll-fade {
+ --timeline-top-fade-height: 2.5rem;
+ -webkit-mask-image:
+ linear-gradient(
+ to bottom,
+ transparent 0%,
+ rgb(0 0 0 / 10%) 10%,
+ rgb(0 0 0 / 30%) 24%,
+ rgb(0 0 0 / 58%) 42%,
+ rgb(0 0 0 / 82%) 62%,
+ rgb(0 0 0 / 96%) 82%,
+ black 100%
+ ),
+ linear-gradient(black, black);
+ -webkit-mask-position: top, bottom;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-size:
+ 100% var(--timeline-top-fade-height),
+ 100% calc(100% - var(--timeline-top-fade-height));
+ mask-image:
+ linear-gradient(
+ to bottom,
+ transparent 0%,
+ rgb(0 0 0 / 10%) 10%,
+ rgb(0 0 0 / 30%) 24%,
+ rgb(0 0 0 / 58%) 42%,
+ rgb(0 0 0 / 82%) 62%,
+ rgb(0 0 0 / 96%) 82%,
+ black 100%
+ ),
+ linear-gradient(black, black);
+ mask-position: top, bottom;
+ mask-repeat: no-repeat;
+ mask-size:
+ 100% var(--timeline-top-fade-height),
+ 100% calc(100% - var(--timeline-top-fade-height));
+ }
+
.workspace-titlebar-controls {
position: absolute;
top: var(--workspace-controls-top);
@@ -323,50 +362,75 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
}
.chat-composer-glass {
- background: var(--surface-raised);
+ background: var(--secondary);
+ -webkit-backdrop-filter: blur(16px);
+ backdrop-filter: blur(16px);
}
- /* Mix from --background (not --card): the lower chrome is a full-width
- strip over the main view, and a card-tinted wash reads as a lighter
- seam against it when no content is scrolled underneath. The backdrop
- blur, not the tint, carries the frosted effect. */
- .chat-composer-lower-chrome {
- background: color-mix(in srgb, var(--background) 20%, transparent);
+ .chat-composer-context-strip {
+ position: relative;
+ isolation: isolate;
}
- /* The translucent lower chrome lets the composer's shadow taper naturally
- into the message canvas. Above the terminal drawer that same shadow reads
- as a dirty light-to-black gradient, so end the workspace on an opaque
- surface and let the drawer's border define the boundary instead. */
- .chat-composer-lower-chrome[data-terminal-open="true"] {
- background: var(--background);
+ .chat-composer-context-strip::before {
+ position: absolute;
+ z-index: -1;
+ inset: 0;
+ border-radius: 0 0 16px 16px;
+ background: color-mix(in srgb, var(--card) 20%, transparent);
+ box-shadow: 0 12px 28px -18px rgb(0 0 0 / 40%);
+ content: "";
+ -webkit-backdrop-filter: blur(16px);
+ backdrop-filter: blur(16px);
}
- .chat-composer-glass {
- box-shadow:
- 0 18px 48px -20px rgb(0 0 0 / 28%),
- 0 4px 14px -7px rgb(0 0 0 / 22%);
+ .dropdown-glass {
+ background: var(--secondary);
+ -webkit-backdrop-filter: blur(16px);
+ backdrop-filter: blur(16px);
+ box-shadow: 0 16px 40px -18px rgb(0 0 0 / 55%);
+ }
+
+ .command-palette-glass {
+ box-shadow: 0 24px 64px -24px rgb(0 0 0 / 65%);
}
- .chat-composer-shared-blur {
+ .command-menu-surface {
+ background: var(--popover);
+ -webkit-backdrop-filter: none;
+ backdrop-filter: none;
+ box-shadow: 0 24px 64px -24px rgb(0 0 0 / 65%);
+ }
+
+ .workflow-dialog-surface {
+ border-color: transparent;
+ background: color-mix(in srgb, var(--popover) 82%, transparent);
-webkit-backdrop-filter: blur(16px);
backdrop-filter: blur(16px);
+ box-shadow: 0 24px 64px -24px rgb(0 0 0 / 65%);
}
- .dark .chat-composer-glass {
- background: var(--surface-raised);
+ .dark .dropdown-glass {
+ box-shadow: 0 18px 44px -18px rgb(0 0 0 / 80%);
}
- .dark .chat-composer-lower-chrome {
- background: color-mix(in srgb, var(--background) 45%, transparent);
+ .dark .model-picker-surface.model-picker-surface {
+ background: color-mix(in srgb, var(--background) 90%, transparent);
}
- .dark .chat-composer-lower-chrome[data-terminal-open="true"] {
- background: var(--background);
+ .dark .command-menu-surface,
+ .dark .command-palette-glass,
+ .dark .workflow-dialog-surface {
+ box-shadow: none;
}
- .dark .chat-composer-glass {
- box-shadow: none;
+ .dark .workflow-dialog-surface {
+ background: color-mix(in srgb, var(--popover) 76%, transparent);
+ }
+
+ .dark .chat-composer-context-strip::before {
+ background: color-mix(in srgb, var(--card) 45%, transparent);
+ box-shadow: 0 14px 32px -18px rgb(0 0 0 / 75%);
}
.chat-composer-lower-chrome {
@@ -376,6 +440,10 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
}
@media (min-width: 40rem) {
+ .chat-timeline-scroll-fade {
+ --timeline-top-fade-height: 3rem;
+ }
+
.chat-composer-horizontal-inset {
padding-inline-start: calc(env(safe-area-inset-left) + 1.25rem);
padding-inline-end: calc(env(safe-area-inset-right) + 1.25rem);
@@ -384,11 +452,19 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
@supports not ((-webkit-backdrop-filter: blur(1px)) or (backdrop-filter: blur(1px))) {
.chat-composer-glass {
+ background: var(--secondary);
+ }
+
+ .chat-composer-context-strip::before {
background: var(--card);
}
- .chat-composer-lower-chrome {
- background: var(--background);
+ .dropdown-glass {
+ background: color-mix(in srgb, var(--popover) 88%, black);
+ }
+
+ .workflow-dialog-surface {
+ background: var(--popover);
}
}
}
@@ -430,25 +506,25 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
:root {
color-scheme: light;
--radius: 0.625rem;
- --background: var(--color-zinc-25);
+ --background: var(--color-white);
--app-chrome-background: var(--background);
- --surface-raised: color-mix(in srgb, var(--card) 20%, transparent);
- --foreground: var(--color-zinc-800);
+ --surface-raised: var(--secondary);
+ --foreground: var(--color-neutral-800);
--card: var(--color-white);
- --card-foreground: var(--color-zinc-800);
+ --card-foreground: var(--color-neutral-800);
--popover: var(--color-white);
- --popover-foreground: var(--color-zinc-800);
+ --popover-foreground: var(--color-neutral-800);
--primary: oklch(0.488 0.217 264);
--primary-foreground: var(--color-white);
- --secondary: var(--color-zinc-50);
- --secondary-foreground: var(--color-zinc-800);
- --muted: var(--color-zinc-50);
- --muted-foreground: var(--color-zinc-500);
- --accent: var(--color-zinc-100);
- --accent-foreground: var(--color-zinc-900);
+ --secondary: --alpha(var(--color-black) / 4%);
+ --secondary-foreground: var(--color-neutral-800);
+ --muted: --alpha(var(--color-black) / 4%);
+ --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-black));
+ --accent: --alpha(var(--color-black) / 4%);
+ --accent-foreground: var(--color-neutral-800);
--destructive: var(--color-red-500);
- --border: var(--color-zinc-200);
- --input: var(--color-zinc-300);
+ --border: --alpha(var(--color-black) / 8%);
+ --input: --alpha(var(--color-black) / 10%);
--ring: oklch(0.488 0.217 264);
--destructive-foreground: var(--color-red-700);
--info: var(--color-blue-500);
@@ -470,22 +546,24 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
@variant dark {
color-scheme: dark;
- --background: var(--color-zinc-950);
+ /* Keep the workspace in the same neutral-black family as sidebar v2.
+ Surfaces lift from this base instead of starting from a milky gray. */
+ --background: var(--color-neutral-950);
--app-chrome-background: var(--background);
- --surface-raised: color-mix(in srgb, var(--card) 45%, transparent);
- --foreground: var(--color-zinc-100);
- --card: var(--color-zinc-900);
- --card-foreground: var(--color-zinc-100);
- --popover: var(--color-zinc-900);
- --popover-foreground: var(--color-zinc-100);
+ --surface-raised: var(--secondary);
+ --foreground: var(--color-neutral-100);
+ --card: color-mix(in srgb, var(--background) 97%, var(--color-white));
+ --card-foreground: var(--color-neutral-100);
+ --popover: color-mix(in srgb, var(--background) 94%, var(--color-white));
+ --popover-foreground: var(--color-neutral-100);
--primary: oklch(0.588 0.217 264);
--primary-foreground: var(--color-white);
- --secondary: var(--color-zinc-900);
- --secondary-foreground: var(--color-zinc-100);
- --muted: var(--color-zinc-900);
- --muted-foreground: var(--color-zinc-400);
- --accent: var(--color-zinc-900);
- --accent-foreground: var(--color-zinc-100);
+ --secondary: --alpha(var(--color-white) / 4%);
+ --secondary-foreground: var(--color-neutral-100);
+ --muted: --alpha(var(--color-white) / 4%);
+ --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-white));
+ --accent: --alpha(var(--color-white) / 4%);
+ --accent-foreground: var(--color-neutral-100);
--destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
--border: --alpha(var(--color-white) / 6%);
--input: --alpha(var(--color-white) / 8%);
@@ -500,27 +578,57 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
}
}
-[data-app-sidebar] {
- --sidebar: var(--color-zinc-50);
- --sidebar-foreground: var(--color-zinc-800);
- --sidebar-muted-foreground: var(--color-zinc-500);
- --sidebar-control-surface: var(--color-zinc-100);
- --sidebar-row-hover: var(--color-zinc-25);
- --sidebar-row-active: var(--color-white);
- --sidebar-row-selected: var(--color-white);
- --sidebar-border: var(--color-zinc-200);
+/* Give both navigation implementations the same cool graphite surface. The
+ version attribute remains useful for layout-specific styling, but color is
+ shared so switching the beta does not switch visual systems. */
+[data-sidebar-version="v1"],
+[data-sidebar-version="v2"] {
+ --background: oklch(0.965 0.009 265);
+ --foreground: oklch(0.27 0.025 265);
+ --card: oklch(0.945 0.014 265);
+ --card-foreground: var(--foreground);
+ --accent: oklch(0.875 0.008 265);
+ --accent-foreground: oklch(0.24 0.012 265);
+ --muted: oklch(0.9 0.018 265);
+ --muted-foreground: oklch(0.49 0.03 265);
+ --border: oklch(0.72 0.025 265 / 28%);
+ --input: oklch(0.62 0.03 265 / 28%);
+ --sidebar: var(--card);
+ --sidebar-foreground: var(--foreground);
+ --sidebar-muted-foreground: var(--muted-foreground);
+ --sidebar-control-surface: var(--muted);
+ --sidebar-row-hover: color-mix(in srgb, var(--foreground) 6%, transparent);
+ --sidebar-row-active: color-mix(in srgb, var(--foreground) 11%, transparent);
+ --sidebar-row-selected: color-mix(in srgb, var(--foreground) 7%, transparent);
+ --sidebar-border: var(--border);
--sidebar-stage-fade: var(--sidebar);
-}
-
-.dark [data-app-sidebar] {
- --sidebar: var(--color-zinc-950);
- --sidebar-foreground: var(--color-zinc-100);
- --sidebar-muted-foreground: var(--color-zinc-400);
- --sidebar-control-surface: var(--color-zinc-800);
- --sidebar-row-hover: var(--color-zinc-900);
- --sidebar-row-active: var(--color-zinc-900);
- --sidebar-row-selected: var(--color-zinc-900);
- --sidebar-border: var(--color-zinc-800);
+ background-color: var(--card);
+}
+
+.dark [data-sidebar-version="v1"],
+.dark [data-sidebar-version="v2"] {
+ --background: #000;
+ --foreground: #f1f3f7;
+ --card: #000;
+ --card-foreground: var(--foreground);
+ --accent: #191a1d;
+ --accent-foreground: #f7f9ff;
+ --muted: #0a0a0a;
+ --muted-foreground: #a3a3a3;
+ --border: rgb(255 255 255 / 8%);
+ --input: rgb(255 255 255 / 18%);
+ --sidebar: var(--card);
+ --sidebar-foreground: var(--foreground);
+ --sidebar-muted-foreground: var(--muted-foreground);
+ --sidebar-control-surface: var(--muted);
+ --sidebar-row-hover: color-mix(in srgb, var(--foreground) 8%, transparent);
+ --sidebar-row-active: color-mix(in srgb, var(--foreground) 11%, transparent);
+ --sidebar-row-selected: color-mix(in srgb, var(--foreground) 7%, transparent);
+ --sidebar-border: var(--border);
+ /* The stage-channel header art must ramp to THIS panel's surface, not the
+ global chrome background, or the fade shows a seam (same rule as the
+ light palette above). */
+ --sidebar-stage-fade: var(--card);
}
body {
diff --git a/apps/web/src/routes/settings.tsx b/apps/web/src/routes/settings.tsx
index 405073210..a9d05d3d4 100644
--- a/apps/web/src/routes/settings.tsx
+++ b/apps/web/src/routes/settings.tsx
@@ -22,7 +22,7 @@ function RestoreDefaultsButton({ onRestored }: { onRestored: () => void }) {
return (
<Button
size="xs"
- variant="outline"
+ variant="ghost"
disabled={changedSettingLabels.length === 0}
onClick={() => void restoreDefaults()}
>
@@ -68,7 +68,7 @@ function SettingsContentLayout() {
{!isElectron && (
<header
className={cn(
- "border-b border-border px-3 py-2 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",
+ "px-3 py-2 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",
COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,
)}
>
@@ -86,7 +86,7 @@ function SettingsContentLayout() {
{isElectron && (
<div
className={cn(
- "drag-region flex h-[52px] shrink-0 items-center border-b border-border px-5 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]",
+ "drag-region flex h-[52px] shrink-0 items-center px-5 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]",
COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,
)}
>