Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

refactor(web): consolidate avatar rendering

Generd036edbfd929
diff --git a/src/web/src/app/(app)/w/[slug]/issues/page.tsx b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
index 1e2da2555..1bf62b53f 100644
--- a/src/web/src/app/(app)/w/[slug]/issues/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
@@ -12,8 +12,7 @@ import type { TaskApi } from "@alook/shared";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import { Skeleton } from "@/components/ui/skeleton";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from "@/components/ui/context-menu";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
@@ -37,14 +36,6 @@ function formatDate(value: string | null) {
return new Date(value).toLocaleString(undefined, { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" });
}
-function AgentAvatar({ agent, size = 24 }: { agent?: Agent | null; size?: number }) {
- const resolved = resolveAvatar(agent?.avatar_url, agent?.id || agent?.name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={agent?.name ?? ""} className="shrink-0 rounded-full object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="shrink-0 rounded-full" />;
-}
-
function IssueCard({
issue,
selected,
@@ -112,7 +103,7 @@ function IssueCard({
<span className="flex items-center">
{threadAgents.slice(0, 3).map((a, i) => (
<span key={a.id} className={cn("rounded-full border-2 border-background", i > 0 && "-ml-2")}>
- <AgentAvatar agent={a} size={16} />
+ <AgentAvatar name={a.name} avatarUrl={a.avatar_url} seed={a.id} size={16} />
</span>
))}
{threadAgents.length > 3 && (
@@ -123,7 +114,7 @@ function IssueCard({
</span>
) : agent ? (
<span className="flex items-center gap-1 truncate">
- <AgentAvatar agent={agent} size={14} />
+ <AgentAvatar name={agent.name} avatarUrl={agent.avatar_url} seed={agent.id} size={14} />
<span className="truncate">{agent.name}</span>
</span>
) : (
diff --git a/src/web/src/app/(app)/w/[slug]/traces/[traceId]/page.tsx b/src/web/src/app/(app)/w/[slug]/traces/[traceId]/page.tsx
index 4852990f8..c9510e9cf 100644
--- a/src/web/src/app/(app)/w/[slug]/traces/[traceId]/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/traces/[traceId]/page.tsx
@@ -9,8 +9,7 @@ import { getTrace, type TraceTask } from "@/lib/api";
import { trackThreadViewed } from "@/lib/analytics";
import { Skeleton } from "@/components/ui/skeleton";
import { ArrowLeft } from "lucide-react";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
function relativeTime(dateStr: string): string {
const date = new Date(dateStr);
@@ -65,14 +64,6 @@ const STATUS_LABELS: Record<string, string> = {
superseded: "Cancelled",
};
-function AgentAvatar({ name, avatarUrl, seed, size = 14 }: { name?: string; avatarUrl?: string | null; seed?: string; size?: number }) {
- const resolved = resolveAvatar(avatarUrl, seed || name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={name ?? ""} className="rounded-full shrink-0 object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="rounded-full shrink-0" />;
-}
-
interface TreeNode extends TraceTask {
children: TreeNode[];
depth: number;
diff --git a/src/web/src/app/(app)/w/[slug]/traces/page.tsx b/src/web/src/app/(app)/w/[slug]/traces/page.tsx
index 815c90dfc..2f1fcc0a3 100644
--- a/src/web/src/app/(app)/w/[slug]/traces/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/traces/page.tsx
@@ -16,8 +16,7 @@ import {
SelectItem,
} from "@/components/ui/select";
import { GitBranch, RefreshCw } from "lucide-react";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import { Button } from "@/components/ui/button";
import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
@@ -73,14 +72,6 @@ function StatusDot({ status }: { status: string }) {
return <span className={`size-1.5 rounded-full shrink-0 ${colorClass}`} />;
}
-function AgentAvatar({ name, avatarUrl, seed, size = 14 }: { name?: string; avatarUrl?: string | null; seed?: string; size?: number }) {
- const resolved = resolveAvatar(avatarUrl, seed || name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={name ?? ""} className="rounded-full shrink-0 object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="rounded-full shrink-0" />;
-}
-
function TraceRow({ trace, slug }: { trace: TraceListItem; slug: string }) {
const duration = formatDuration(trace.started_at, trace.completed_at);
const statusLabel = trace.status === "active" ? "Active" : trace.status === "failed" ? "Failed" : "Completed";
diff --git a/src/web/src/components/avatar/agent-avatar.test.ts b/src/web/src/components/avatar/agent-avatar.test.ts
index ba731b8b7..a4ba9c0da 100644
--- a/src/web/src/components/avatar/agent-avatar.test.ts
+++ b/src/web/src/components/avatar/agent-avatar.test.ts
@@ -53,4 +53,23 @@ describe("AgentAvatar", () => {
const empty = AgentAvatar({}) as unknown as BeamEl
expect(empty.props.seed).toBe("?")
})
+
+ it("applies one caller-owned shape consistently to photos and generated avatars", () => {
+ const photo = AgentAvatar({
+ name: "Bot",
+ avatarUrl: "/api/avatar",
+ className: "rounded-xl",
+ alt: "",
+ }) as unknown as ImgEl & { props: { className: string; alt: string } }
+ const generated = AgentAvatar({
+ name: "Bot",
+ seed: "bot-id",
+ className: "rounded-xl",
+ }) as unknown as BeamEl & { props: { className: string } }
+ expect(photo.props.className).toContain("rounded-xl")
+ expect(photo.props.className).not.toContain("rounded-full")
+ expect(photo.props.alt).toBe("")
+ expect(generated.props.className).toContain("rounded-xl")
+ expect(generated.props.className).not.toContain("rounded-full")
+ })
})
diff --git a/src/web/src/components/avatar/agent-avatar.tsx b/src/web/src/components/avatar/agent-avatar.tsx
index 2cda5aa2d..d78e4d9ce 100644
--- a/src/web/src/components/avatar/agent-avatar.tsx
+++ b/src/web/src/components/avatar/agent-avatar.tsx
@@ -2,20 +2,31 @@
import { GeneratedAvatar } from "./generated-avatar";
import { resolveAvatar } from "@/lib/avatar/resolve";
+import { cn } from "@/lib/utils";
-export function AgentAvatar({ name, avatarUrl, seed, size = 32 }: { name?: string | null; avatarUrl?: string | null; seed?: string | null; size?: number }) {
+interface AgentAvatarProps {
+ name?: string | null;
+ avatarUrl?: string | null;
+ seed?: string | null;
+ size?: number;
+ className?: string;
+ alt?: string;
+}
+
+export function AgentAvatar({ name, avatarUrl, seed, size = 32, className, alt }: AgentAvatarProps) {
// Prefer a stable id as the beam seed; fall back to the name when no id is
// available (rename would then shift the face — a known tradeoff).
const resolved = resolveAvatar(avatarUrl, seed || name || "?");
+ const avatarClassName = cn("shrink-0 rounded-full", className);
if (resolved.kind === "photo") {
return (
<img
src={resolved.url}
- alt={name ?? ""}
- className="rounded-full shrink-0 object-cover"
+ alt={alt ?? name ?? ""}
+ className={cn("object-cover", avatarClassName)}
style={{ width: size, height: size }}
/>
);
}
- return <GeneratedAvatar seed={resolved.seed} size={size} className="rounded-full shrink-0" />;
+ return <GeneratedAvatar seed={resolved.seed} size={size} className={avatarClassName} />;
}
diff --git a/src/web/src/components/avatar/bot-avatar-picker-dialog.tsx b/src/web/src/components/avatar/bot-avatar-picker-dialog.tsx
index 2c5eb5fdc..663eb6b11 100644
--- a/src/web/src/components/avatar/bot-avatar-picker-dialog.tsx
+++ b/src/web/src/components/avatar/bot-avatar-picker-dialog.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
import { Camera, Shuffle } from "lucide-react";
import {
Dialog,
@@ -14,76 +14,24 @@ import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
import { ImageCropDialog } from "@/components/community/image-crop-dialog";
import { validateIconSourceFile } from "@/lib/community/image-crop";
import { toast } from "sonner";
-import { type AvatarDraft, isPhotoAvatarUrl } from "./photo";
+import { type AvatarDraft } from "@/lib/avatar/model";
import { GeneratedAvatar } from "./generated-avatar";
-import { serializeBeamSeed, parseBeamSeed } from "@/lib/avatar/seed-url";
import { useIsMobile } from "@/hooks/use-mobile";
+import { useAvatarDraftPicker, type AvatarPickerTab } from "./use-avatar-draft-picker";
interface BotAvatarPickerDialogProps {
image: string | null;
onChange: (draft: AvatarDraft) => void;
}
-type PhotoDraft = { file: File | null; previewUrl: string };
-
-function randomSeed(): string {
- return crypto.randomUUID();
-}
-
/**
* Dual-mode generated or photo bot avatar picker. Generated choices persist as `avatar:beam:{seed}`.
*/
export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialogProps) {
- const [open, setOpen] = useState(false);
const isMobile = useIsMobile();
const fileInputRef = useRef<HTMLInputElement>(null);
const [pendingCropSrc, setPendingCropSrc] = useState<{ src: string; fileName: string } | null>(null);
-
- // A photo is anything that's a real URL (http/https/leading-`/`) or a
- // session-local `blob:` preview — NOT a `avatar:beam:{seed}` value, which is
- // the procedural (generated) case.
- const isPhoto = (url: string | null) => !!url && !parseBeamSeed(url) && (isPhotoAvatarUrl(url) || url.startsWith("blob:"));
-
- const [tab, setTab] = useState<"generate" | "photo">(isPhoto(image) ? "photo" : "generate");
- const [seed, setSeed] = useState<string>(() => parseBeamSeed(image) ?? randomSeed());
- const [photoDraft, setPhotoDraft] = useState<PhotoDraft | null>(
- () => (isPhoto(image) ? { file: null, previewUrl: image! } : null),
- );
- const [activeKind, setActiveKind] = useState<"procedural" | "photo">(
- isPhoto(image) ? "photo" : "procedural",
- );
-
- // Keep the trigger preview honest when `image` changes from outside this
- // component. Idempotent against this component's own `onChange` echoes.
- useEffect(() => {
- const nowPhoto = isPhoto(image);
- setSeed(parseBeamSeed(image) ?? randomSeed());
- setPhotoDraft((prev) =>
- nowPhoto
- ? prev && prev.previewUrl === image
- ? prev
- : { file: null, previewUrl: image! }
- : null,
- );
- setActiveKind(nowPhoto ? "photo" : "procedural");
- }, [image]);
-
- const shuffle = () => {
- const next = randomSeed();
- setSeed(next);
- setActiveKind("procedural");
- onChange({ kind: "procedural", image: serializeBeamSeed(next) });
- };
-
- const emitForTab = (nextTab: "generate" | "photo", currentSeed: string, photo: PhotoDraft | null) => {
- if (nextTab === "photo" && photo) {
- setActiveKind("photo");
- onChange({ kind: "photo", file: photo.file, previewUrl: photo.previewUrl });
- } else {
- setActiveKind("procedural");
- onChange({ kind: "procedural", image: serializeBeamSeed(currentSeed) });
- }
- };
+ const picker = useAvatarDraftPicker(image, onChange);
const pickPhoto = () => fileInputRef.current?.click();
const onFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -98,29 +46,11 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
setPendingCropSrc({ src: URL.createObjectURL(file), fileName: file.name });
};
- const triggerPreview = activeKind === "photo" ? photoDraft?.previewUrl : null;
+ const triggerPreview = picker.activeKind === "photo" ? picker.photoDraft?.previewUrl : null;
return (
<>
- <Dialog
- open={open}
- onOpenChange={(nextOpen) => {
- if (nextOpen) {
- const nowPhoto = isPhoto(image);
- setSeed(parseBeamSeed(image) ?? randomSeed());
- if (nowPhoto) {
- setPhotoDraft((prev) =>
- prev && prev.previewUrl === image ? prev : { file: null, previewUrl: image! },
- );
- } else {
- setPhotoDraft(null);
- }
- setTab(nowPhoto ? "photo" : "generate");
- setActiveKind(nowPhoto ? "photo" : "procedural");
- }
- setOpen(nextOpen);
- }}
- >
+ <Dialog open={picker.open} onOpenChange={picker.onOpenChange}>
<div className="flex justify-center">
<DialogTrigger
render={
@@ -134,7 +64,7 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
<img src={triggerPreview} alt="" className="size-20 rounded-2xl object-cover" />
) : (
<span className="block size-20 overflow-hidden rounded-2xl">
- <GeneratedAvatar seed={seed} size={80} className="size-full" />
+ <GeneratedAvatar seed={picker.seed} size={80} className="size-full" />
</span>
)}
</DialogTrigger>
@@ -149,11 +79,9 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
<DialogTitle>Choose Avatar</DialogTitle>
</DialogHeader>
<Tabs
- value={tab}
+ value={picker.tab}
onValueChange={(v) => {
- const nextTab = v as "generate" | "photo";
- setTab(nextTab);
- emitForTab(nextTab, seed, photoDraft);
+ picker.selectTab(v as AvatarPickerTab);
}}
>
<TabsList className="mx-auto">
@@ -163,9 +91,9 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
<TabsContent value="generate">
<div className="flex flex-col items-center gap-3 py-6">
<span className="block size-32 overflow-hidden rounded-full">
- <GeneratedAvatar seed={seed} size={128} className="size-full" />
+ <GeneratedAvatar seed={picker.seed} size={128} className="size-full" />
</span>
- <Button type="button" variant="secondary" size="sm" onClick={shuffle}>
+ <Button type="button" variant="secondary" size="sm" onClick={picker.shuffle}>
<Shuffle className="size-3.5" />
Shuffle
</Button>
@@ -185,14 +113,14 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
onClick={pickPhoto}
className="grid size-32 place-items-center overflow-hidden rounded-full border-2 border-dashed border-input text-muted-foreground hover:border-primary hover:text-foreground"
>
- {photoDraft ? (
- <img src={photoDraft.previewUrl} alt="" className="size-full object-cover" />
+ {picker.photoDraft ? (
+ <img src={picker.photoDraft.previewUrl} alt="" className="size-full object-cover" />
) : (
<Camera className="size-8" />
)}
</button>
<Button type="button" variant="secondary" size="sm" onClick={pickPhoto}>
- {photoDraft ? "Change photo" : "Upload Photo"}
+ {picker.photoDraft ? "Change photo" : "Upload Photo"}
</Button>
</div>
</TabsContent>
@@ -200,7 +128,7 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
{isMobile && (
<button
type="button"
- onClick={() => setOpen(false)}
+ onClick={picker.close}
className="w-full rounded-xl bg-primary py-3 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors"
>
Done
@@ -215,12 +143,10 @@ export function BotAvatarPickerDialog({ image, onChange }: BotAvatarPickerDialog
maskShape="circle"
onCropped={(file) => {
const previewUrl = URL.createObjectURL(file);
- if (photoDraft?.previewUrl.startsWith("blob:")) {
- URL.revokeObjectURL(photoDraft.previewUrl);
+ if (picker.photoDraft?.previewUrl.startsWith("blob:")) {
+ URL.revokeObjectURL(picker.photoDraft.previewUrl);
}
- setPhotoDraft({ file, previewUrl });
- setActiveKind("photo");
- onChange({ kind: "photo", file, previewUrl });
+ picker.selectPhoto({ file, previewUrl });
URL.revokeObjectURL(pendingCropSrc.src);
setPendingCropSrc(null);
}}
diff --git a/src/web/src/components/avatar/index.ts b/src/web/src/components/avatar/index.ts
index 1912cfdea..f48485452 100644
--- a/src/web/src/components/avatar/index.ts
+++ b/src/web/src/components/avatar/index.ts
@@ -1,4 +1,4 @@
-export { type AvatarDraft, isPhotoAvatarUrl } from "./photo";
+export { type AvatarDraft, isPhotoAvatarUrl } from "@/lib/avatar/model";
export { GeneratedAvatar } from "./generated-avatar";
export { SeededBackdrop } from "./seeded-backdrop";
diff --git a/src/web/src/components/avatar/photo.ts b/src/web/src/components/avatar/photo.ts
deleted file mode 100644
index 07b21df20..000000000
--- a/src/web/src/components/avatar/photo.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Photo-avatar detection and the dual-mode draft used by the bot picker.
-
-export function isPhotoAvatarUrl(url: string | null | undefined): boolean {
- return !!url && (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("/"));
-}
-
-// `file` is null when re-opening an existing photo untouched (edit); a real
-// `File` once freshly cropped this session.
-export type AvatarDraft =
- | { kind: "procedural"; image: string }
- | { kind: "photo"; file: File | null; previewUrl: string };
diff --git a/src/web/src/components/avatar/seeded-backdrop.test.ts b/src/web/src/components/avatar/seeded-backdrop.test.ts
index e566c33ea..d3694c2bb 100644
--- a/src/web/src/components/avatar/seeded-backdrop.test.ts
+++ b/src/web/src/components/avatar/seeded-backdrop.test.ts
@@ -3,7 +3,7 @@ import { SeededBackdrop } from "./seeded-backdrop"
describe("SeededBackdrop", () => {
it("fills its positioned parent with the requested native SVG variant", () => {
- const profile = SeededBackdrop({ seed: "profile", variant: "profile" }) as unknown as {
+ const profile = SeededBackdrop({ seed: "profile" }) as unknown as {
props: { "aria-hidden": boolean; className: string; dangerouslySetInnerHTML: { __html: string } }
}
expect(profile.props["aria-hidden"]).toBe(true)
diff --git a/src/web/src/components/avatar/seeded-backdrop.tsx b/src/web/src/components/avatar/seeded-backdrop.tsx
index e1bc60dcf..d62d244c8 100644
--- a/src/web/src/components/avatar/seeded-backdrop.tsx
+++ b/src/web/src/components/avatar/seeded-backdrop.tsx
@@ -1,11 +1,11 @@
-import { renderSeededBackdropSvg, type SeededBackdropVariant } from "@/lib/avatar/backdrop"
+import { renderSeededBackdropSvg } from "@/lib/avatar/backdrop"
-export function SeededBackdrop({ seed, variant }: { seed: string; variant: SeededBackdropVariant }) {
+export function SeededBackdrop({ seed }: { seed: string }) {
return (
<span
aria-hidden
className="pointer-events-none absolute inset-0 [&>svg]:block [&>svg]:size-full"
- dangerouslySetInnerHTML={{ __html: renderSeededBackdropSvg(seed, variant) }}
+ dangerouslySetInnerHTML={{ __html: renderSeededBackdropSvg(seed) }}
/>
)
}
diff --git a/src/web/src/components/avatar/use-avatar-draft-picker.test.ts b/src/web/src/components/avatar/use-avatar-draft-picker.test.ts
new file mode 100644
index 000000000..8d7099e49
--- /dev/null
+++ b/src/web/src/components/avatar/use-avatar-draft-picker.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest"
+import { avatarPickerStateFromImage, isPhotoDraftSource } from "./use-avatar-draft-picker"
+import { serializeBeamSeed } from "@/lib/avatar/seed-url"
+
+describe("avatar draft picker state", () => {
+ it.each(["https://cdn.example.com/avatar.png", "/api/avatar", "blob:preview"])(
+ "recognizes photo source %s",
+ (value) => expect(isPhotoDraftSource(value)).toBe(true),
+ )
+
+ it("keeps serialized generated seeds out of the photo branch", () => {
+ const image = serializeBeamSeed("stored-seed")
+ expect(isPhotoDraftSource(image)).toBe(false)
+ expect(avatarPickerStateFromImage(image, "fallback")).toEqual({
+ tab: "generate",
+ seed: "stored-seed",
+ photoDraft: null,
+ activeKind: "procedural",
+ })
+ })
+
+ it("restores photo and empty initial state without losing the fallback seed", () => {
+ expect(avatarPickerStateFromImage("/api/avatar", "fallback")).toEqual({
+ tab: "photo",
+ seed: "fallback",
+ photoDraft: { file: null, previewUrl: "/api/avatar" },
+ activeKind: "photo",
+ })
+ expect(avatarPickerStateFromImage(null, "fallback")).toEqual({
+ tab: "generate",
+ seed: "fallback",
+ photoDraft: null,
+ activeKind: "procedural",
+ })
+ })
+})
diff --git a/src/web/src/components/avatar/use-avatar-draft-picker.ts b/src/web/src/components/avatar/use-avatar-draft-picker.ts
new file mode 100644
index 000000000..1e8cbd14b
--- /dev/null
+++ b/src/web/src/components/avatar/use-avatar-draft-picker.ts
@@ -0,0 +1,90 @@
+"use client"
+
+import { useCallback, useEffect, useState } from "react"
+import { isPhotoAvatarUrl, type AvatarDraft } from "@/lib/avatar/model"
+import { parseBeamSeed, serializeBeamSeed } from "@/lib/avatar/seed-url"
+
+export type AvatarPickerTab = "generate" | "photo"
+export type PhotoAvatarDraft = { file: File | null; previewUrl: string }
+
+export interface AvatarPickerState {
+ tab: AvatarPickerTab
+ seed: string
+ photoDraft: PhotoAvatarDraft | null
+ activeKind: AvatarDraft["kind"]
+}
+
+export function isPhotoDraftSource(value: string | null | undefined): value is string {
+ return !!value && !parseBeamSeed(value) && (isPhotoAvatarUrl(value) || value.startsWith("blob:"))
+}
+
+export function avatarPickerStateFromImage(image: string | null, fallbackSeed: string): AvatarPickerState {
+ const photo = isPhotoDraftSource(image)
+ return {
+ tab: (photo ? "photo" : "generate") as AvatarPickerTab,
+ seed: parseBeamSeed(image) ?? fallbackSeed,
+ photoDraft: photo ? { file: null, previewUrl: image } satisfies PhotoAvatarDraft : null,
+ activeKind: (photo ? "photo" : "procedural") as AvatarDraft["kind"],
+ }
+}
+
+function randomSeed(): string {
+ return crypto.randomUUID()
+}
+
+export function useAvatarDraftPicker(image: string | null, onChange: (draft: AvatarDraft) => void) {
+ const [open, setOpen] = useState(false)
+ const [state, setState] = useState(() => avatarPickerStateFromImage(image, randomSeed()))
+
+ const syncFromImage = useCallback((value: string | null, resetTab: boolean) => {
+ const next = avatarPickerStateFromImage(value, randomSeed())
+ setState((current) => ({
+ ...next,
+ tab: resetTab ? next.tab : current.tab,
+ photoDraft:
+ next.photoDraft && current.photoDraft?.previewUrl === next.photoDraft.previewUrl
+ ? current.photoDraft
+ : next.photoDraft,
+ }))
+ }, [])
+
+ useEffect(() => {
+ syncFromImage(image, false)
+ }, [image, syncFromImage])
+
+ const onOpenChange = (nextOpen: boolean) => {
+ if (nextOpen) syncFromImage(image, true)
+ setOpen(nextOpen)
+ }
+
+ const selectTab = (nextTab: AvatarPickerTab) => {
+ if (nextTab === "photo" && state.photoDraft) {
+ setState((current) => ({ ...current, tab: nextTab, activeKind: "photo" }))
+ onChange({ kind: "photo", file: state.photoDraft.file, previewUrl: state.photoDraft.previewUrl })
+ return
+ }
+ setState((current) => ({ ...current, tab: nextTab, activeKind: "procedural" }))
+ onChange({ kind: "procedural", image: serializeBeamSeed(state.seed) })
+ }
+
+ const shuffle = () => {
+ const nextSeed = randomSeed()
+ setState((current) => ({ ...current, seed: nextSeed, activeKind: "procedural" }))
+ onChange({ kind: "procedural", image: serializeBeamSeed(nextSeed) })
+ }
+
+ const selectPhoto = (photo: PhotoAvatarDraft) => {
+ setState((current) => ({ ...current, photoDraft: photo, activeKind: "photo" }))
+ onChange({ kind: "photo", file: photo.file, previewUrl: photo.previewUrl })
+ }
+
+ return {
+ ...state,
+ close: () => setOpen(false),
+ onOpenChange,
+ open,
+ selectPhoto,
+ selectTab,
+ shuffle,
+ }
+}
diff --git a/src/web/src/components/canvas/active-tasks-float.tsx b/src/web/src/components/canvas/active-tasks-float.tsx
index 2617bd4fa..2ec8c4c62 100644
--- a/src/web/src/components/canvas/active-tasks-float.tsx
+++ b/src/web/src/components/canvas/active-tasks-float.tsx
@@ -6,20 +6,11 @@ import { X } from "lucide-react";
import { useAgentContext } from "@/contexts/agent-context";
import { useWorkspace } from "@/contexts/workspace-context";
import { useIsMobile } from "@/hooks/use-mobile";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import type { WorkspaceActiveTask } from "@/lib/api";
import { relativeTime } from "@/lib/time";
import { useAgentChatSheet } from "@/contexts/agent-chat-sheet-context";
-function AgentAvatar({ name, avatarUrl, seed, size = 20 }: { name?: string; avatarUrl?: string | null; seed?: string; size?: number }) {
- const resolved = resolveAvatar(avatarUrl, seed || name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={name ?? ""} className="rounded-full shrink-0 object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="rounded-full shrink-0" />;
-}
-
function TaskRow({
task,
slug,
diff --git a/src/web/src/components/canvas/link-sidecar.tsx b/src/web/src/components/canvas/link-sidecar.tsx
index 53f4fa187..470fd830a 100644
--- a/src/web/src/components/canvas/link-sidecar.tsx
+++ b/src/web/src/components/canvas/link-sidecar.tsx
@@ -12,8 +12,7 @@ import { Button } from "@/components/ui/button";
import { MarkdownEditor } from "@/components/ui/markdown-editor";
import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
import { Trash2 } from "lucide-react";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import { ConfirmDialog } from "@/components/ui/confirm-dialog";
const DEBOUNCE_MS = 500;
@@ -106,11 +105,7 @@ export function LinkSidecar({
const renderAvatar = (agent: Agent | undefined) => {
if (!agent) return null;
- const resolved = resolveAvatar(agent.avatar_url, agent.id || agent.name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={agent.name} className="shrink-0 rounded-xl object-cover" style={{ width: 32, height: 32 }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={32} className="shrink-0 rounded-xl" />;
+ return <AgentAvatar name={agent.name} avatarUrl={agent.avatar_url} seed={agent.id} size={32} className="rounded-xl" />;
};
return (
diff --git a/src/web/src/components/canvas/upcoming-events-float.tsx b/src/web/src/components/canvas/upcoming-events-float.tsx
index 1ec902f77..59b8fc857 100644
--- a/src/web/src/components/canvas/upcoming-events-float.tsx
+++ b/src/web/src/components/canvas/upcoming-events-float.tsx
@@ -6,19 +6,10 @@ import { CalendarDays, X } from "lucide-react";
import { useAgentContext } from "@/contexts/agent-context";
import { useWorkspace } from "@/contexts/workspace-context";
import { useIsMobile } from "@/hooks/use-mobile";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import { listCalendarEvents } from "@/lib/api";
import type { CalendarEvent } from "@alook/shared";
-function AgentAvatar({ name, avatarUrl, seed, size = 20 }: { name?: string; avatarUrl?: string | null; seed?: string; size?: number }) {
- const resolved = resolveAvatar(avatarUrl, seed || name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={name ?? ""} className="rounded-full shrink-0 object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="rounded-full shrink-0" />;
-}
-
interface AgentEventSummary {
agentId: string;
agentName: string;
diff --git a/src/web/src/components/community/avatar.tsx b/src/web/src/components/community/avatar.tsx
index ef0e4f8e3..373c67ee7 100644
--- a/src/web/src/components/community/avatar.tsx
+++ b/src/web/src/components/community/avatar.tsx
@@ -1,7 +1,7 @@
import type React from "react"
import { Avatar as UiAvatar, AvatarImage, AvatarFallback, AvatarBadge } from "@/components/ui/avatar"
import { GeneratedAvatar } from "@/components/avatar"
-import { parseBeamSeed } from "@/lib/avatar/seed-url"
+import { resolveAvatar } from "@/lib/avatar/resolve"
import { avatarInitial } from "@/lib/community/avatar"
import type { Presence } from "./_types"
@@ -17,10 +17,6 @@ const STATUS_COLOR: Record<Presence, string> = {
offline: "var(--muted-foreground)",
}
-function isUrl(s: string | undefined | null): boolean {
- return !!s && (s.startsWith("http://") || s.startsWith("https://") || s.startsWith("/"))
-}
-
export function Avatar({ label, seed, src, size = 40, dim = false, presence, ringColor = "var(--background)" }: {
label: string
// Stable id the fallback shape avatar is derived from. Never a display name:
@@ -39,13 +35,10 @@ export function Avatar({ label, seed, src, size = 40, dim = false, presence, rin
ringColor?: string
}) {
const safeLabel = label || "?"
- const imageUrl = src || (isUrl(safeLabel) ? safeLabel : undefined)
- // Beam seed: an explicit `avatar:beam:{seed}` stored in `label` wins;
- // otherwise the stable `seed` id. Legacy `avatar:{shape…}` configs are not
- // honored — they resolve to null here and fall through to the id seed. When
- // there's neither, we drop to a plain letter (a beam is never derived from a
- // display name).
- const beamSeed = !imageUrl ? (parseBeamSeed(safeLabel) ?? seed) : undefined
+ // `label` historically also carried stored avatar values, so keep it as the
+ // fallback input when `src` is absent. The shared resolver owns URL/generated
+ // precedence and returns a plain-letter fallback when there is no stable id.
+ const resolved = resolveAvatar(src || safeLabel, seed || undefined)
// Priority: image URL > beam (from stored seed or id) > single letter. Radix
// `AvatarFallback` renders whenever no `AvatarImage` is present, so we must
@@ -53,17 +46,17 @@ export function Avatar({ label, seed, src, size = 40, dim = false, presence, rin
// — otherwise both stack on top of each other (the "two-avatar-in-one-place" bug).
return (
<UiAvatar
- className={beamSeed ? "after:hidden" : "bg-muted"}
+ className={resolved.kind === "beam" ? "after:hidden" : "bg-muted"}
style={{ width: size, height: size, opacity: dim ? 0.4 : 1 }}
>
- {imageUrl ? (
+ {resolved.kind === "photo" ? (
<>
- <AvatarImage src={imageUrl} alt={safeLabel} />
+ <AvatarImage src={resolved.url} alt={safeLabel} />
<AvatarFallback className="font-medium" style={{ fontSize: size * 0.4 }}>
{avatarInitial(safeLabel)}
</AvatarFallback>
</>
- ) : beamSeed ? (
+ ) : resolved.kind === "beam" ? (
<span className="size-full rounded-full overflow-hidden">
{/* rounded-full must live on GeneratedAvatar's OWN wrapper (which carries
overflow-hidden), not only on this outer span: the beam SVG has a
@@ -72,7 +65,7 @@ export function Avatar({ label, seed, src, size = 40, dim = false, presence, rin
radius leaks the beam's square background as a rounded-square
(the pinned-panel "clipped avatar" bug, WebKit-only). Every other
GeneratedAvatar caller co-locates the radius on it for this reason. */}
- <GeneratedAvatar seed={beamSeed} size={size} className="size-full rounded-full" />
+ <GeneratedAvatar seed={resolved.seed} size={size} className="size-full rounded-full" />
</span>
) : (
<AvatarFallback className="font-medium" style={{ fontSize: size * 0.4 }}>
diff --git a/src/web/src/components/community/channel-header.tsx b/src/web/src/components/community/channel-header.tsx
index 0fd495cf9..eab1f849f 100644
--- a/src/web/src/components/community/channel-header.tsx
+++ b/src/web/src/components/community/channel-header.tsx
@@ -178,7 +178,7 @@ function ServerCrumb({ id, name, icon, size = 5, className = "" }: { id: string;
aria-label={name}
title={name}
>
- {icon ? <img src={icon} alt="" className="size-full object-cover" /> : <><SeededBackdrop variant="icon" seed={id} /><span className="relative -translate-x-px [-webkit-text-stroke:0.5px_currentColor]">{avatarInitial(name)}</span></>}
+ {icon ? <img src={icon} alt="" className="size-full object-cover" /> : <><SeededBackdrop seed={id} /><span className="relative -translate-x-px [-webkit-text-stroke:0.5px_currentColor]">{avatarInitial(name)}</span></>}
</span>
)
}
diff --git a/src/web/src/components/community/create-server-dialog.tsx b/src/web/src/components/community/create-server-dialog.tsx
index dcbef419c..67b97ae0b 100644
--- a/src/web/src/components/community/create-server-dialog.tsx
+++ b/src/web/src/components/community/create-server-dialog.tsx
@@ -141,7 +141,7 @@ export function CreateServerDialog({ onClose, onCreateServer }: {
<img src={iconPreview} alt="" className="size-full object-cover" />
) : (
<>
- <SeededBackdrop variant="icon" seed={previewSeed} />
+ <SeededBackdrop seed={previewSeed} />
{initial ? (
<span className="relative -translate-x-0.5 font-brand text-[2rem] font-bold leading-none [-webkit-text-stroke:0.5px_currentColor]">
{initial}
diff --git a/src/web/src/components/community/profile-card.tsx b/src/web/src/components/community/profile-card.tsx
index 8c7f2dccc..d3cfce86e 100644
--- a/src/web/src/components/community/profile-card.tsx
+++ b/src/web/src/components/community/profile-card.tsx
@@ -82,7 +82,7 @@ export function ProfileCard({ data, x, y, bp, onClose, onMessage, isSelf, onUpda
const card = (
<>
<div className="relative -m-2 mb-0 h-16 overflow-hidden rounded-t-lg">
- <SeededBackdrop variant="profile" seed={backdropSeed} />
+ <SeededBackdrop seed={backdropSeed} />
</div>
<div className="px-2 pb-2">
{/* `pl-4` — the card body below has its own `p-4`, so its text sits
diff --git a/src/web/src/components/community/rail-folder.tsx b/src/web/src/components/community/rail-folder.tsx
index af56d6c6e..1c2eac623 100644
--- a/src/web/src/components/community/rail-folder.tsx
+++ b/src/web/src/components/community/rail-folder.tsx
@@ -53,7 +53,7 @@ export function RailFolder({
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" /> : <><SeededBackdrop variant="icon" seed={s.id} /><span className="relative">{s.initial}</span></>}
+ {s.icon ? <img src={s.icon} alt={s.name} className="size-full object-cover" /> : <><SeededBackdrop seed={s.id} /><span className="relative">{s.initial}</span></>}
</span>
) : (
<span key={i} className="aspect-square rounded-sm bg-card/50" />
diff --git a/src/web/src/components/community/server-icon.tsx b/src/web/src/components/community/server-icon.tsx
index 987a69e7c..fe42a9f98 100644
--- a/src/web/src/components/community/server-icon.tsx
+++ b/src/web/src/components/community/server-icon.tsx
@@ -38,7 +38,7 @@ export function ServerIcon({
<img src={icon} alt={name} className="size-full object-cover" />
) : (
<>
- <SeededBackdrop variant="icon" seed={id} />
+ <SeededBackdrop seed={id} />
<span className="relative -translate-x-0.5 [-webkit-text-stroke:0.5px_currentColor]">{initial}</span>
</>
)}
diff --git a/src/web/src/components/community/server-rail.tsx b/src/web/src/components/community/server-rail.tsx
index db17aaa45..213927ffd 100644
--- a/src/web/src/components/community/server-rail.tsx
+++ b/src/web/src/components/community/server-rail.tsx
@@ -212,7 +212,7 @@ export const ServerRail = memo(function ServerRail({
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" /> : <><SeededBackdrop variant="icon" seed={s.id} /><span className="relative -translate-x-0.5 [-webkit-text-stroke:0.5px_currentColor]">{s.initial}</span></>}
+ {s.icon ? <img src={s.icon} alt={s.name} className="size-full object-cover" /> : <><SeededBackdrop seed={s.id} /><span className="relative -translate-x-0.5 [-webkit-text-stroke:0.5px_currentColor]">{s.initial}</span></>}
</span>
) : (
<span key={idx} className="aspect-square rounded-sm bg-card/50" />
@@ -231,7 +231,7 @@ export const ServerRail = memo(function ServerRail({
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" /> : <><SeededBackdrop variant="icon" seed={s.id} /><span className="relative -translate-x-0.5 [-webkit-text-stroke:0.5px_currentColor]">{s.initial}</span></>}
+ {icon ? <img src={icon} alt={s.name} className="size-full object-cover" /> : <><SeededBackdrop seed={s.id} /><span className="relative -translate-x-0.5 [-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.tsx
index ffd40fa94..2130a9a5e 100644
--- a/src/web/src/components/community/sortable-server.tsx
+++ b/src/web/src/components/community/sortable-server.tsx
@@ -129,7 +129,7 @@ function SortableServerImpl({
/>
) : (
<>
- <SeededBackdrop variant="icon" seed={server.id} />
+ <SeededBackdrop seed={server.id} />
<span className="relative -translate-x-0.5 [-webkit-text-stroke:0.5px_currentColor]">
{server.initial}
</span>
diff --git a/src/web/src/components/issues/issue-sheet.tsx b/src/web/src/components/issues/issue-sheet.tsx
index af765172d..794682f4b 100644
--- a/src/web/src/components/issues/issue-sheet.tsx
+++ b/src/web/src/components/issues/issue-sheet.tsx
@@ -43,8 +43,7 @@ import { formatSize } from "@/components/agent-chat/artifact-sheet";
import { isTerminalIssueStatus, toAlookAddress } from "@alook/shared";
import type { TraceTask } from "@/lib/api";
import { updateIssue } from "@/lib/api";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import { ConfirmDialog } from "@/components/ui/confirm-dialog";
import { Kbd } from "@/components/ui/kbd";
import { AutoResizeTextarea } from "@/components/ui/auto-resize-textarea";
@@ -67,19 +66,11 @@ function statusLabel(status: string) {
// --- Sub-components ---
-function AgentAvatar({ agent, size = 24 }: { agent?: Agent | null; size?: number }) {
- const resolved = resolveAvatar(agent?.avatar_url, agent?.id || agent?.name || "?");
- if (resolved.kind === "photo") {
- return <img src={resolved.url} alt={agent?.name ?? ""} className="shrink-0 rounded-full object-cover" style={{ width: size, height: size }} />;
- }
- return <GeneratedAvatar seed={resolved.seed} size={size} className="shrink-0 rounded-full" />;
-}
-
function AgentIdentity({ agent, size = 24 }: { agent: Agent; size?: number }) {
const email = agent.email_handle ? toAlookAddress(agent.email_handle) : "";
return (
<div className="flex min-w-0 items-center gap-2">
- <AgentAvatar agent={agent} size={size} />
+ <AgentAvatar name={agent.name} avatarUrl={agent.avatar_url} seed={agent.id} size={size} />
<div className="flex min-w-0 flex-1 items-center gap-2">
<div className="truncate text-xs font-medium">{agent.name}</div>
{email ? <div className="truncate text-[11px] text-muted-foreground">{email}</div> : null}
@@ -441,7 +432,7 @@ export function IssueSheet({
isRunning ? "border-emerald-500/30 bg-emerald-500/10" : "border-border/60 bg-muted/30"
)}>
<div className="flex items-center gap-2 text-xs">
- {t.agent && <AgentAvatar agent={{ avatar_url: t.agent.avatarUrl, name: t.agent.name } as Agent} size={16} />}
+ {t.agent && <AgentAvatar name={t.agent.name} avatarUrl={t.agent.avatarUrl} seed={t.agent.name || "?"} size={16} />}
<span className={isRunning ? "text-emerald-600 dark:text-emerald-400" : "text-muted-foreground"}>
{t.agent?.name ?? "Agent"} {isRunning ? "is working" : "— queued"}
</span>
diff --git a/src/web/src/components/studio-onboarding/team-preview.tsx b/src/web/src/components/studio-onboarding/team-preview.tsx
index aedc8f5be..c26f36fbb 100644
--- a/src/web/src/components/studio-onboarding/team-preview.tsx
+++ b/src/web/src/components/studio-onboarding/team-preview.tsx
@@ -4,8 +4,7 @@ import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { RefreshCw } from "lucide-react";
-import { GeneratedAvatar } from "@/components/avatar";
-import { resolveAvatar } from "@/lib/avatar/resolve";
+import { AgentAvatar } from "@/components/avatar";
import {
Select,
SelectTrigger,
@@ -67,16 +66,11 @@ export function TeamPreview({
)}
>
{members.map((m, i) => {
- const resolved = resolveAvatar(m.avatarUrl, m.name || "?");
return (
<Card key={i} size="sm" className="flex flex-col px-3 py-4 gap-2 h-full">
{/* Header: avatar + name/badge */}
<div className="flex items-center gap-2">
- {resolved.kind === "photo" ? (
- <img src={resolved.url} alt={m.name} className="size-9 rounded-xl object-cover shrink-0" />
- ) : (
- <GeneratedAvatar seed={resolved.seed} size={36} className="rounded-xl shrink-0" />
- )}
+ <AgentAvatar name={m.name} avatarUrl={m.avatarUrl} seed={m.name || "?"} size={36} className="rounded-xl" />
<div className="flex flex-col items-start gap-1">
<span className="text-sm font-medium">{m.name}</span>
<span className="text-[10px] text-muted-foreground bg-muted/60 px-2 py-1 rounded">
diff --git a/src/web/src/lib/avatar/backdrop.test.ts b/src/web/src/lib/avatar/backdrop.test.ts
index 90f1b7269..058ac6e68 100644
--- a/src/web/src/lib/avatar/backdrop.test.ts
+++ b/src/web/src/lib/avatar/backdrop.test.ts
@@ -22,14 +22,14 @@ describe("renderSeededBackdropSvg", () => {
second: "translate(2 -2) rotate(258 40 40) scale(1.4)",
},
])("matches boring-avatars 2.0.4 marble fixtures for $seed", ({ seed, colors, first, second }) => {
- const svg = renderSeededBackdropSvg(seed, "icon")
+ const svg = renderSeededBackdropSvg(seed)
expect(svg).toContain(`<rect width="80" height="80" fill="${colors[0]}"/>`)
expect(svg).toContain(`fill="${colors[1]}" transform="${first}"`)
expect(svg).toContain(`fill="${colors[2]}" transform="${second}"`)
})
it("keeps the upstream 80px marble composition and stretching behavior", () => {
- const svg = renderSeededBackdropSvg("profile-id", "profile")
+ const svg = renderSeededBackdropSvg("profile-id")
expect(svg).toContain('viewBox="0 0 80 80"')
expect(svg).toContain('preserveAspectRatio="none"')
expect(svg.match(/<path /g)).toHaveLength(2)
@@ -39,18 +39,15 @@ describe("renderSeededBackdropSvg", () => {
expect(svg).not.toContain("fill-opacity")
})
- it("is deterministic while keeping profile and icon geometry visually identical", () => {
- const icon = renderSeededBackdropSvg("stable-id", "icon")
- const profile = renderSeededBackdropSvg("stable-id", "profile")
- expect(renderSeededBackdropSvg("stable-id", "icon")).toBe(icon)
- expect(icon).not.toBe(profile)
- expect(icon.replace(/alook-marble-\d+/g, "id")).toBe(profile.replace(/alook-marble-\d+/g, "id"))
+ it("is deterministic regardless of where the backdrop is placed", () => {
+ const svg = renderSeededBackdropSvg("stable-id")
+ expect(renderSeededBackdropSvg("stable-id")).toBe(svg)
})
it("varies the upstream color and transform data across seeds", () => {
const normalizeIds = (svg: string) => svg.replace(/alook-marble-\d+/g, "id")
- expect(normalizeIds(renderSeededBackdropSvg("server-a", "icon"))).not.toBe(
- normalizeIds(renderSeededBackdropSvg("server-b", "icon")),
+ expect(normalizeIds(renderSeededBackdropSvg("server-a"))).not.toBe(
+ normalizeIds(renderSeededBackdropSvg("server-b")),
)
})
})
diff --git a/src/web/src/lib/avatar/backdrop.ts b/src/web/src/lib/avatar/backdrop.ts
index b74cf5780..1ffdfacb7 100644
--- a/src/web/src/lib/avatar/backdrop.ts
+++ b/src/web/src/lib/avatar/backdrop.ts
@@ -1,7 +1,5 @@
import { avatarHash, avatarThemeFromSeed } from "./theme"
-export type SeededBackdropVariant = "profile" | "icon"
-
const MARBLE_SIZE = 80
const MARBLE_LAYERS = 3
@@ -34,9 +32,9 @@ function marbleLayersFromSeed(seed: string) {
})
}
-export function renderSeededBackdropSvg(seed: string, variant: SeededBackdropVariant): string {
+export function renderSeededBackdropSvg(seed: string): string {
const layers = marbleLayersFromSeed(seed)
- const id = `alook-marble-${avatarHash(`${seed}:${variant}`)}`
+ const id = `alook-marble-${avatarHash(seed)}`
const maskId = `${id}-mask`
const filterId = `${id}-filter`
diff --git a/src/web/src/lib/avatar/model.ts b/src/web/src/lib/avatar/model.ts
new file mode 100644
index 000000000..d6a9fe280
--- /dev/null
+++ b/src/web/src/lib/avatar/model.ts
@@ -0,0 +1,10 @@
+/** A persisted photo avatar is always a remote or app-routable URL. */
+export function isPhotoAvatarUrl(value: string | null | undefined): boolean {
+ return !!value && (value.startsWith("http://") || value.startsWith("https://") || value.startsWith("/"))
+}
+
+// `file` is null when re-opening an existing photo untouched; it is populated
+// after a freshly selected photo has been cropped in the current session.
+export type AvatarDraft =
+ | { kind: "procedural"; image: string }
+ | { kind: "photo"; file: File | null; previewUrl: string }
diff --git a/src/web/src/lib/avatar/resolve.test.ts b/src/web/src/lib/avatar/resolve.test.ts
index c879daa31..632389f13 100644
--- a/src/web/src/lib/avatar/resolve.test.ts
+++ b/src/web/src/lib/avatar/resolve.test.ts
@@ -34,4 +34,13 @@ describe("resolveAvatar", () => {
expect(resolveAvatar(null, "id_1")).toEqual({ kind: "beam", seed: "id_1" })
expect(resolveAvatar(undefined, "id_1")).toEqual({ kind: "beam", seed: "id_1" })
})
+
+ it("returns a plain fallback when no stable seed exists", () => {
+ expect(resolveAvatar(null)).toEqual({ kind: "fallback" })
+ expect(resolveAvatar("display name")).toEqual({ kind: "fallback" })
+ })
+
+ it("honors an explicitly provided empty fallback seed", () => {
+ expect(resolveAvatar(null, "")).toEqual({ kind: "beam", seed: "" })
+ })
})
diff --git a/src/web/src/lib/avatar/resolve.ts b/src/web/src/lib/avatar/resolve.ts
index 16165fe80..e35013ff3 100644
--- a/src/web/src/lib/avatar/resolve.ts
+++ b/src/web/src/lib/avatar/resolve.ts
@@ -6,19 +6,26 @@
* `avatar:{shape…}` config that we deliberately no longer honor — falls back
* to an id-seeded beam.
*/
-import { isPhotoAvatarUrl } from "@/components/avatar/photo"
+import { isPhotoAvatarUrl } from "./model"
import { parseBeamSeed } from "./seed-url"
export type ResolvedAvatar =
| { kind: "photo"; url: string }
| { kind: "beam"; seed: string }
+export type AvatarResolution = ResolvedAvatar | { kind: "fallback" }
+
+export function resolveAvatar(value: string | null | undefined, fallbackSeed: string): ResolvedAvatar
+export function resolveAvatar(
+ value: string | null | undefined,
+ fallbackSeed?: string,
+): AvatarResolution
export function resolveAvatar(
value: string | null | undefined,
- fallbackSeed: string,
-): ResolvedAvatar {
+ fallbackSeed?: string,
+): AvatarResolution {
if (isPhotoAvatarUrl(value)) return { kind: "photo", url: value! }
const beamSeed = parseBeamSeed(value)
if (beamSeed) return { kind: "beam", seed: beamSeed }
- return { kind: "beam", seed: fallbackSeed }
+ return fallbackSeed !== undefined ? { kind: "beam", seed: fallbackSeed } : { kind: "fallback" }
}