Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat(community): brand-font server identity + rail-indicator hidden at rest
Gus28960f51fe9d
diff --git a/src/web/src/components/community/channel-header.tsx b/src/web/src/components/community/channel-header.tsxindex 273527404..0fdab1e74 100644--- a/src/web/src/components/community/channel-header.tsx+++ b/src/web/src/components/community/channel-header.tsx@@ -76,7 +76,7 @@ export function ChannelHeader({{onBack && (<Button variant="ghost" size="icon-sm" onClick={onBack} className="text-muted-foreground hover:text-foreground" aria-label="Back"><ChevronLeft className="size-5" /></Button>)}- {server && <ServerCrumb id={server.id} name={server.name} icon={server.icon} className="ml-1" />}+ {server && <ServerCrumb id={server.id} name={server.name} icon={server.icon} size={6} className="ml-1" />}{breadcrumb ? (<><button onClick={breadcrumb.onNavigateBack} className={`flex items-center gap-1 text-muted-foreground hover:text-foreground transition-colors ${server ? "" : "ml-1"}`}>@@ -163,17 +163,20 @@ function ChannelOverflowMenu({// serves as the separator), now also reused by `ChannelSidebar`'s header at// the larger `size={7}`. Tailwind only picks up complete literal class names// at build time, so `size` can't be interpolated — it's an explicit ternary.-export function ServerCrumb({ id, name, icon, size = 5, className = "" }: { id: string; name: string; icon: string | null; size?: 5 | 7; className?: string }) {+export function ServerCrumb({ id, name, icon, size = 5, className = "" }: { id: string; name: string; icon: string | null; size?: 5 | 6 | 7; className?: string }) {+ const sizeCls = size === 7 ? "size-7" : size === 6 ? "size-6" : "size-5"+ const iconTextCls = size === 7 ? "text-xs" : size === 6 ? "text-[0.6875rem]" : "text-[0.625rem]"+ const initialTextCls = size === 7 ? "text-base" : size === 6 ? "text-sm" : "text-xs"return (<span// No icon → the same deterministic marble fallback used by the rail// (`sortable-server.tsx`) and folder rows, so a server reads as "the// same server" everywhere it shows up, not a flat generic tile here.- className={`relative grid shrink-0 place-items-center overflow-hidden rounded-md font-semibold ${icon ? "bg-secondary text-foreground" : "text-white [text-shadow:0_1px_2px_rgb(0_0_0/0.35)]"} ${size === 7 ? "size-7 text-xs" : "size-5 text-[0.625rem]"} ${className}`}+ className={`relative grid shrink-0 place-items-center overflow-hidden rounded-md ${icon ? `font-semibold ${iconTextCls} bg-secondary text-foreground` : `font-brand font-bold ${initialTextCls} text-white [text-shadow:0_1px_2px_rgb(0_0_0/0.35)]`} ${sizeCls} ${className}`}aria-label={name}title={name}>- {icon ? <img src={icon} alt="" className="size-full object-cover" /> : <><MarbleBackground seed={id} /><span className="relative">{avatarInitial(name)}</span></>}+ {icon ? <img src={icon} alt="" className="size-full object-cover" /> : <><MarbleBackground seed={id} /><span className="relative -translate-x-[1px] [-webkit-text-stroke:0.5px_currentColor]">{avatarInitial(name)}</span></>}</span>)}diff --git a/src/web/src/components/community/channel-sidebar.crumb.test.ts b/src/web/src/components/community/channel-sidebar.crumb.test.tsindex 30a810b41..e01df6c83 100644--- a/src/web/src/components/community/channel-sidebar.crumb.test.ts+++ b/src/web/src/components/community/channel-sidebar.crumb.test.ts@@ -2,15 +2,9 @@ import { describe, it, expect, vi } from "vitest"import { createElement } from "react"import { renderToStaticMarkup } from "react-dom/server"-// The header's ServerCrumb is gated on the mobile breakpoint — mock the hook-// so each case renders deterministically without a DOM/matchMedia.-const isMobile = vi.fn<() => boolean>()-vi.mock("@/hooks/use-mobile", () => ({ useIsMobile: () => isMobile() }))-import { ChannelSidebar } from "./channel-sidebar"import type { ChannelTree } from "./use-channel-tree"-// Minimal empty tree — the header renders regardless of channel content.const emptyTree = {collapsed: new Set<string>(),catOrder: [],@@ -41,18 +35,10 @@ const render = () =>}),)-describe("ChannelSidebar header ServerCrumb", () => {- it("renders the server crumb on mobile (rail is hidden — sole identity marker)", () => {- isMobile.mockReturnValue(true)- // ServerCrumb is the only element that emits aria-label/title with the name.- expect(render()).toContain('aria-label="Alpha"')- })-- it("omits the server crumb on desktop (rail already shows the icon)", () => {- isMobile.mockReturnValue(false)+describe("ChannelSidebar header", () => {+ it("renders the server name as the sole header identity marker (no duplicate ServerCrumb icon)", () => {const html = render()- expect(html).not.toContain('aria-label="Alpha"')- // The server name itself still renders in the header text.expect(html).toContain("Alpha")+ expect(html).not.toContain('aria-label="Alpha"')})})diff --git a/src/web/src/components/community/channel-sidebar.tsx b/src/web/src/components/community/channel-sidebar.tsxindex ec394793e..da0aeefef 100644--- a/src/web/src/components/community/channel-sidebar.tsx+++ b/src/web/src/components/community/channel-sidebar.tsx@@ -17,8 +17,6 @@ import { CategorySettingsDialog } from "./category-settings-dialog"import { catId, catOf, isCat, type ChannelTree } from "./use-channel-tree"import { InviteDialog } from "./invite-dialog"import { ChannelAddMembersDialog } from "./channel-add-members-dialog"-import { ServerCrumb } from "./channel-header"-import { useIsMobile } from "@/hooks/use-mobile"import type { Channel, SettingsSection } from "./_types"import { UNCATEGORIZED_CATEGORY_ID, type ChannelType } from "@alook/shared"@@ -70,10 +68,6 @@ export const ChannelSidebar = memo(function ChannelSidebar({onInvitePopoverOpenChange?: (open: boolean) => void}) {const { collapsed, catOrder, order, catNames, catPrivate, catPending, toggleCat, removeChannel, renameChannel, renameCategory, onDragOver, onDragEnd: treeDragEnd } = tree- // The server rail (with its own icon) is only visible on desktop, so the- // header's ServerCrumb would double up there — show it only on mobile, where- // the rail is hidden and this is the sole server identity marker.- const isMobile = useIsMobile()// Category the dragged channel started in — captured at drag start, because// `onDragOver` mutates `order` mid-drag so by drop time it already reflects// the destination.@@ -236,8 +230,7 @@ export const ChannelSidebar = memo(function ChannelSidebar({{serverName && onOpenSettings ? (<DropdownMenu><DropdownMenuTrigger className="flex min-w-0 max-w-full items-center gap-2 rounded-md px-2 py-1 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none">- {isMobile && <ServerCrumb id={serverId ?? ""} name={serverName} icon={serverIcon ?? null} size={7} />}- <span className="min-w-0 truncate text-lg font-semibold">{serverName}</span>+ <span className="min-w-0 truncate font-brand text-3xl font-bold">{serverName}</span><ChevronDown className="size-4 shrink-0 text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="start" className="w-48">@@ -250,8 +243,7 @@ export const ChannelSidebar = memo(function ChannelSidebar({</DropdownMenu>) : (<span className="flex min-w-0 max-w-full items-center gap-2 px-2">- {isMobile && serverName && <ServerCrumb id={serverId ?? ""} name={serverName} icon={serverIcon ?? null} size={7} />}- <span className="min-w-0 truncate text-lg font-semibold">{serverName || "\u00a0"}</span>+ <span className="min-w-0 truncate font-brand text-3xl font-bold">{serverName || "\u00a0"}</span></span>)}{serverId && onInvitePopoverOpenChange && (diff --git a/src/web/src/components/community/rail-indicator.tsx b/src/web/src/components/community/rail-indicator.tsxindex 06fc5f80c..db6efe5d7 100644--- a/src/web/src/components/community/rail-indicator.tsx+++ b/src/web/src/components/community/rail-indicator.tsx@@ -1,11 +1,11 @@-// Left rail indicator — 3 states: active (40px), hover (20px), default (8px dot).+// Left rail indicator — 3 states: active (40px), hover (20px), default (hidden).// Parent must be `group relative`.export function RailIndicator({ active }: { active?: boolean }) {return (<spanclassName={["absolute left-0 top-1/2 w-1 -translate-y-1/2 rounded-r-full bg-foreground transition-all duration-150",- active ? "h-10" : "h-2 group-hover:h-5",+ active ? "h-10" : "h-0 group-hover:h-5",].join(" ")}/>)diff --git a/src/web/src/components/community/server-rail.tsx b/src/web/src/components/community/server-rail.tsxindex 0aa703c0d..d7b63d6d8 100644--- a/src/web/src/components/community/server-rail.tsx+++ b/src/web/src/components/community/server-rail.tsx@@ -222,11 +222,11 @@ export const ServerRail = memo(function ServerRail({<spankey={s.id}className={[- "relative grid aspect-square place-items-center overflow-hidden rounded-sm text-[7px] font-semibold",+ "relative grid aspect-square place-items-center overflow-hidden rounded-sm font-brand text-[10px] font-semibold",s.icon ? "bg-card text-muted-foreground" : "text-white [text-shadow:0_1px_1px_rgb(0_0_0/0.35)]",].join(" ")}>- {s.icon ? <img src={s.icon} alt={s.name} className="size-full object-cover" /> : <><MarbleBackground seed={s.id} /><span className="relative">{s.initial}</span></>}+ {s.icon ? <img src={s.icon} alt={s.name} className="size-full object-cover" /> : <><MarbleBackground seed={s.id} /><span className="relative -translate-x-[2px] [-webkit-text-stroke:0.5px_currentColor]">{s.initial}</span></>}</span>) : (<span key={idx} className="aspect-square rounded-sm bg-card/50" />@@ -241,11 +241,11 @@ export const ServerRail = memo(function ServerRail({return (<divclassName={[- "relative grid size-10 place-items-center overflow-hidden rounded-xl text-sm font-semibold shadow-(--e2)",+ "relative grid size-10 place-items-center overflow-hidden rounded-xl font-brand text-xl font-bold shadow-(--e2)",icon ? "bg-secondary text-foreground" : "text-white [text-shadow:0_1px_2px_rgb(0_0_0/0.35)]",].join(" ")}>- {icon ? <img src={icon} alt={s.name} className="size-full object-cover" /> : <><MarbleBackground seed={s.id} /><span className="relative">{s.initial}</span></>}+ {icon ? <img src={icon} alt={s.name} className="size-full object-cover" /> : <><MarbleBackground seed={s.id} /><span className="relative -translate-x-[2px] [-webkit-text-stroke:0.5px_currentColor]">{s.initial}</span></>}</div>)})()}diff --git a/src/web/src/components/community/sortable-server.tsx b/src/web/src/components/community/sortable-server.tsxindex 90dae9ed0..e3c743b8d 100644--- a/src/web/src/components/community/sortable-server.tsx+++ b/src/web/src/components/community/sortable-server.tsx@@ -1,76 +1,179 @@-"use client"+"use client";-import { useState } from "react"-import { useSortable } from "@dnd-kit/sortable"-import { CSS } from "@dnd-kit/utilities"-import { ContextMenu, ContextMenuTrigger, ContextMenuContent, ContextMenuItem, ContextMenuSeparator } from "@/components/ui/context-menu"-import { RailIndicator } from "./rail-indicator"-import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"-import { ConfirmDialog } from "@/components/ui/confirm-dialog"-import { NumberTicker } from "@/components/ui/number-ticker"-import { MarbleBackground } from "@/components/avatar"-import { tid } from "@/lib/community/testids"-import type { Server } from "./_types"+import { useState } from "react";+import { useSortable } from "@dnd-kit/sortable";+import { CSS } from "@dnd-kit/utilities";+import {+ ContextMenu,+ ContextMenuTrigger,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuSeparator,+} from "@/components/ui/context-menu";+import { RailIndicator } from "./rail-indicator";+import {+ Tooltip,+ TooltipTrigger,+ TooltipContent,+} from "@/components/ui/tooltip";+import { ConfirmDialog } from "@/components/ui/confirm-dialog";+import { NumberTicker } from "@/components/ui/number-ticker";+import { MarbleBackground } from "@/components/avatar";+import { tid } from "@/lib/community/testids";+import type { Server } from "./_types";-export function SortableServer({ server, active, onClick, onLeave, onOpenSettings, onOpenInvitePopover, onCreateFolder, groupTarget, inFolder, dragging: isDragActive }: { server: Server; active?: boolean; onClick: () => void; onLeave?: () => void; onOpenSettings?: () => void; onOpenInvitePopover?: () => void; onCreateFolder?: () => void; groupTarget?: boolean; inFolder?: boolean; dragging?: boolean }) {- const { attributes, listeners, setNodeRef, transform, transition, isDragging, isOver, activeIndex, index } = useSortable({ id: server.id })- const style = { transform: CSS.Transform.toString(transform), transition, opacity: isDragActive ? 0.3 : 1, zIndex: isDragging ? 10 : undefined }- const showLine = isOver && !isDragging && !isDragActive- const lineSide: "top" | "bottom" = activeIndex !== -1 && activeIndex < index ? "bottom" : "top"- const [confirmLeave, setConfirmLeave] = useState(false)+export function SortableServer({+ server,+ active,+ onClick,+ onLeave,+ onOpenSettings,+ onOpenInvitePopover,+ onCreateFolder,+ groupTarget,+ inFolder,+ dragging: isDragActive,+}: {+ server: Server;+ active?: boolean;+ onClick: () => void;+ onLeave?: () => void;+ onOpenSettings?: () => void;+ onOpenInvitePopover?: () => void;+ onCreateFolder?: () => void;+ groupTarget?: boolean;+ inFolder?: boolean;+ dragging?: boolean;+}) {+ const {+ attributes,+ listeners,+ setNodeRef,+ transform,+ transition,+ isDragging,+ isOver,+ activeIndex,+ index,+ } = useSortable({ id: server.id });+ const style = {+ transform: CSS.Transform.toString(transform),+ transition,+ opacity: isDragActive ? 0.3 : 1,+ zIndex: isDragging ? 10 : undefined,+ };+ const showLine = isOver && !isDragging && !isDragActive;+ const lineSide: "top" | "bottom" =+ activeIndex !== -1 && activeIndex < index ? "bottom" : "top";+ const [confirmLeave, setConfirmLeave] = useState(false);return (<><Tooltip>- <TooltipTrigger render={<span className="flex w-full justify-center" />}>+ <TooltipTrigger+ render={<span className="flex w-full justify-center" />}+ ><ContextMenu><ContextMenuTrigger- render={<div ref={setNodeRef} style={style} className="group relative flex w-full justify-center" />}+ render={+ <div+ ref={setNodeRef}+ style={style}+ className="group relative flex w-full justify-center"+ />+ }>- {showLine && <div className={`pointer-events-none absolute inset-x-3 z-10 h-0.5 rounded-full bg-primary ${lineSide === "top" ? "-top-1" : "-bottom-1"}`} />}+ {showLine && (+ <div+ className={`pointer-events-none absolute inset-x-3 z-10 h-0.5 rounded-full bg-primary ${lineSide === "top" ? "-top-1" : "-bottom-1"}`}+ />+ )}<RailIndicator active={active} />- <div className={["relative size-10 transition-all duration-150", groupTarget ? "scale-110 rounded-xl ring-2 ring-primary" : "", isDragging ? "rounded-xl border-2 border-dashed border-muted-foreground/40" : ""].join(" ")}>+ <div+ className={[+ "relative size-10 transition-all duration-150",+ groupTarget ? "scale-110 rounded-xl ring-2 ring-primary" : "",+ isDragging+ ? "rounded-xl border-2 border-dashed border-muted-foreground/40"+ : "",+ ].join(" ")}+ ><buttondata-testid={tid.serverIcon(server.id)}onClick={active ? undefined : onClick}{...attributes}{...listeners}className={[- "relative grid size-10 touch-none place-items-center overflow-hidden text-sm font-semibold transition-all duration-150 active:cursor-grabbing",- active ? "cursor-default rounded-xl" : "cursor-pointer rounded-[18px] hover:rounded-xl",+ "relative grid size-10 touch-none place-items-center overflow-hidden font-brand text-xl font-bold transition-all duration-150 active:cursor-grabbing",+ active+ ? "cursor-default rounded-xl"+ : "cursor-pointer rounded-[18px] hover:rounded-xl",server.icon- ? active ? "bg-primary text-primary-foreground" : "bg-card hover:bg-primary hover:text-primary-foreground"+ ? active+ ? "bg-primary text-primary-foreground"+ : "bg-card hover:bg-primary hover:text-primary-foreground": "text-white [text-shadow:0_1px_2px_rgb(0_0_0/0.35)] hover:brightness-110",].join(" ")}>{server.icon ? (- <img src={server.icon} alt={server.name} className="size-full object-cover" />+ <img+ src={server.icon}+ alt={server.name}+ className="size-full object-cover"+ />) : (- <><MarbleBackground seed={server.id} /><span className="relative">{server.initial}</span></>+ <>+ <MarbleBackground seed={server.id} />+ <span className="relative -translate-x-[2px] [-webkit-text-stroke:0.5px_currentColor]">+ {server.initial}+ </span>+ </>)}</button>{server.mentions > 0 && (- <span data-testid={tid.railUnreadBadge(server.id)} className="pointer-events-none absolute -bottom-1 -right-1 grid h-5 min-w-5 place-items-center rounded-full bg-primary px-1 text-[11px] font-bold text-primary-foreground ring-2 ring-(--d-rail)">+ <span+ data-testid={tid.railUnreadBadge(server.id)}+ className="pointer-events-none absolute -bottom-1 -right-1 grid h-5 min-w-5 place-items-center rounded-full bg-primary px-1 text-[11px] font-bold text-primary-foreground ring-2 ring-(--d-rail)"+ ><NumberTicker value={server.mentions} /></span>)}</div></ContextMenuTrigger><ContextMenuContent className="w-52">- <div className="truncate px-2 py-1 text-xs font-semibold text-muted-foreground">{server.name}</div>- {onOpenInvitePopover && <ContextMenuItem onClick={onOpenInvitePopover}>Invite to Server</ContextMenuItem>}- {!inFolder && onCreateFolder && <ContextMenuItem onClick={onCreateFolder}>Create group</ContextMenuItem>}- <ContextMenuItem onClick={onOpenSettings}>Server settings</ContextMenuItem>+ <div className="truncate px-2 py-1 text-xs font-semibold text-muted-foreground">+ {server.name}+ </div>+ {onOpenInvitePopover && (+ <ContextMenuItem onClick={onOpenInvitePopover}>+ Invite to Server+ </ContextMenuItem>+ )}+ {!inFolder && onCreateFolder && (+ <ContextMenuItem onClick={onCreateFolder}>+ Create group+ </ContextMenuItem>+ )}+ <ContextMenuItem onClick={onOpenSettings}>+ Server settings+ </ContextMenuItem>{!server.isOwner && !inFolder && (<><ContextMenuSeparator />- <ContextMenuItem onClick={() => setConfirmLeave(true)} className="text-destructive data-highlighted:bg-destructive/10 data-highlighted:text-destructive">Leave server</ContextMenuItem>+ <ContextMenuItem+ onClick={() => setConfirmLeave(true)}+ className="text-destructive data-highlighted:bg-destructive/10 data-highlighted:text-destructive"+ >+ Leave server+ </ContextMenuItem></>)}</ContextMenuContent></ContextMenu></TooltipTrigger>- <TooltipContent side="right" sideOffset={8}>{server.name}</TooltipContent>+ <TooltipContent side="right" sideOffset={8}>+ {server.name}+ </TooltipContent></Tooltip><ConfirmDialogopen={confirmLeave}@@ -79,8 +182,11 @@ export function SortableServer({ server, active, onClick, onLeave, onOpenSettingdescription="You won't see this server's channels anymore, and you'll need a new invite to come back."confirmLabel="Leave server"confirmVariant="destructive"- onConfirm={() => { setConfirmLeave(false); onLeave?.() }}+ onConfirm={() => {+ setConfirmLeave(false);+ onLeave?.();+ }}/></>- )+ );}