AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
refactor(frontend): reduce the expert avatar creator to one AI avatar (#14933)
Ubbe8bf99465945c
diff --git a/autogpt_platform/backend/backend/api/features/experts/AVATARS.md b/autogpt_platform/backend/backend/api/features/experts/AVATARS.mdindex 6efc46fd30..56b3f8dd99 100644--- a/autogpt_platform/backend/backend/api/features/experts/AVATARS.md+++ b/autogpt_platform/backend/backend/api/features/experts/AVATARS.md@@ -20,7 +20,7 @@ The identity never changes with the Expert's name, role, skills, category or the## Custom Experts-A raised Expert starts on the General fallback. From the Team page its owner can keep that look, upload a picture (PNG/JPEG/WebP, 5 MB, scanned as before) or generate a candidate. A hired built-in can keep its saved identity or change appearance the same way; the picker never offers another Expert's face.+The raise flow asks for a category before generating an avatar. The picker rolls the allowed traits within that category and offers Regenerate, Upload a picture and Use this avatar. A raised Expert starts on the General fallback while generation runs or if it fails. From the Team page its owner can keep that look, upload a picture (PNG/JPEG/WebP, 5 MB, scanned as before) or generate a candidate. A hired built-in can keep its saved identity or change appearance the same way; the picker never offers another Expert's face.## Generation@@ -28,7 +28,7 @@ A raised Expert starts on the General fallback. From the Team page its owner canThe prompt in `avatar_generation.py` is the construction specification and the 25 September material policy: two touching masses, one category hue, low-sheen clay, cream `#EAE2D5` only on the lower form with a recessed groove, the gentle charcoal face placed optically, no anatomical readings, no purple, opaque warm studio tile. References follow the generation standard in order: Maria (finish, light, face, cream material), Mina (silhouette range, cream placement) and an accepted peer of the requested family as the color reference. They are the library's own 512 px exports, copied into `avatar_references/` with their hashes in `manifest.json`; a hash mismatch refuses to generate. Content has no accepted peer yet and takes its color from the hex anchor alone.-`EXPERT_AVATAR_MODEL` defaults to the design system's pinned snapshot `gpt-image-2-2026-04-21` and needs the backend `OPENAI_API_KEY`; any override must support image edits with several reference images and opaque PNG output. The request asks for one 1024 px opaque PNG at high quality; validation checks format, size, the 5 MB limit, that the tile is opaque and that it carries artwork. Validation cannot prove a render follows every visual rule, which is why the user reviews the candidate and chooses **Use this avatar** before anything is saved. Jobs, limits (five per user per 24 hours, four minutes apart, failures count), Redis storage and the scanned media upload path are unchanged from #14858. A generated candidate is that Expert's own appearance; it is not added to the managed library.+`EXPERT_AVATAR_MODEL` defaults to the design system's pinned snapshot `gpt-image-2-2026-04-21` and needs the backend `OPENAI_API_KEY`; any override must support image edits with several reference images and opaque PNG output. The request asks for one 1024 px opaque PNG at high quality; validation checks format, size, the 5 MB limit, that the tile is opaque and that it carries artwork. Validation cannot prove a render follows every visual rule, which is why the user reviews the candidate and chooses **Use this avatar** before anything is saved. Jobs, limits (ten per user per 24 hours, fifteen seconds apart, failures count), Redis storage and the scanned media upload path use the same storage and upload flow as #14858. A generated candidate is that Expert's own appearance; it is not added to the managed library.## Before releasediff --git a/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py b/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.pyindex 106f9d950b..2a6b3cf0d1 100644--- a/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py+++ b/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py@@ -109,6 +109,7 @@ async def test_rate_limit_and_unavailable_redis_fail_closed(monkeypatch):await avatar_jobs.reserve_generation("owner")assert error.value.status_code == 429assert error.value.headers == {"Retry-After": "120"}+ assert str(avatar_jobs.DAILY_LIMIT) in error.value.detailredis.eval.side_effect = ConnectionError()with pytest.raises(HTTPException) as error:await avatar_jobs.reserve_generation("owner")diff --git a/autogpt_platform/backend/backend/api/features/experts/avatar_jobs.py b/autogpt_platform/backend/backend/api/features/experts/avatar_jobs.pyindex 72bd68100e..21b48042f5 100644--- a/autogpt_platform/backend/backend/api/features/experts/avatar_jobs.py+++ b/autogpt_platform/backend/backend/api/features/experts/avatar_jobs.py@@ -18,13 +18,17 @@ from backend.data.redis_client import get_redis_asynclogger = logging.getLogger(__name__)JOB_TTL = 3600GENERATION_TIMEOUT = 240-_RESERVE = """+# Regenerating is the picker's main control, so the gap between attempts is+# short enough to feel like a shuffle and long enough to stop a held key.+DAILY_LIMIT = 10+COOLDOWN = 15+_RESERVE = f"""local count = tonumber(redis.call('HGET', KEYS[1], 'count') or '0')-if count >= 5 then return math.max(1, redis.call('TTL', KEYS[1])) end+if count >= {DAILY_LIMIT} then return math.max(1, redis.call('TTL', KEYS[1])) endlocal next = tonumber(redis.call('HGET', KEYS[1], 'next') or '0')local now = tonumber(ARGV[1])if next > now then return next - now end-redis.call('HSET', KEYS[1], 'count', count + 1, 'next', now + 240)+redis.call('HSET', KEYS[1], 'count', count + 1, 'next', now + {COOLDOWN})if count == 0 then redis.call('EXPIRE', KEYS[1], 86400) endreturn 0"""@@ -54,7 +58,8 @@ async def reserve_generation(user_id: str) -> None:if retry_after:raise HTTPException(429,- "Please wait before generating again. Limit: five avatars per day.",+ "Please wait before generating again. "+ f"Limit: {DAILY_LIMIT} avatars per day.",headers={"Retry-After": str(retry_after)},)diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/helpers.test.tsindex ebc148c92c..c5a7a8be11 100644--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/helpers.test.ts+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/helpers.test.ts@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";import { getExpertRoleLabel, getIntroLine } from "./helpers";describe("getExpertRoleLabel", () => {- // The nine roles the hire flow offers as presets (RoleStep/helpers.ts), which+ // The roles the hire flow has offered as presets (CategoryStep/helpers.ts), which// is the shape most hired experts will carry.test.each([["Marketer", "Marketer"],diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsxindex 2edccdd065..ceee392b97 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx@@ -1,3 +1,4 @@+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import { getListCopilotSkillsMockHandler } from "@/app/api/__generated__/endpoints/skills/skills.msw";import { Toaster } from "@/components/molecules/Toast/toaster";import { server } from "@/mocks/mock-server";@@ -8,8 +9,14 @@ import {within,} from "@/tests/integrations/test-utils";import userEvent from "@testing-library/user-event";+import { http, HttpResponse } from "msw";import { afterEach, beforeEach, expect, test, vi } from "vitest";-import { loadDraft, saveDraft, VOICE_SKIPPED_LABEL } from "../helpers";+import {+ EMPTY_DRAFT,+ loadDraft,+ saveDraft,+ VOICE_SKIPPED_LABEL,+} from "../helpers";import RaisePage from "../page";const { setFlagStatusMock } = vi.hoisted(() => ({@@ -60,37 +67,45 @@ function mockReducedMotion() {);}-function seedAtAvatar(name = "Maria", color: string | null = "violet-300") {+function generationHandlers(requests: unknown[] = []) {+ return [+ http.post("*/api/experts/avatars/generations", async ({ request }) => {+ requests.push(await request.json());+ return HttpResponse.json(+ { id: "job-1", status: "pending" },+ { status: 202 },+ );+ }),+ http.get("*/api/experts/avatars/generations/job-1", () =>+ HttpResponse.json({+ id: "job-1",+ status: "complete",+ avatar_url: "https://cdn.test/generated.png",+ }),+ ),+ ];+}++function seedAtAvatar(category: ExpertAvatarRequestCategory) {saveDraft({+ ...EMPTY_DRAFT,step: "avatar",hasStarted: true,- role: "marketer",- jobTitle: "Marketing Manager",- name,- color,- avatarUrl: null,- about: null,- voicePreferences: "",+ category,+ color: "green-300",+ jobTitle: "Financial Analyst",+ name: "Maria",voiceLabel: VOICE_SKIPPED_LABEL,- budget: null,- marketplace: null,- skills: null,});}-async function openPicker() {- seedAtAvatar();+function renderRaise() {render(<><RaisePage /><Toaster /></>,);- await screen.findByRole(- "group",- { name: "Managed looks" },- { timeout: 5000 },- );}beforeEach(() => {@@ -104,34 +119,92 @@ afterEach(() => {vi.clearAllMocks();});-test("starts on the General fallback and saves it only after confirmation", async () => {- await openPicker();- const general = "/autogpt-characters/v2.1/expert-general-01/neutral/128.webp";- await userEvent.click(screen.getByRole("button", { name: "General" }));+test("the area beat answers the color first and asks for a job title", async () => {+ const requests: unknown[] = [];+ server.use(...generationHandlers(requests));+ saveDraft({ ...EMPTY_DRAFT, hasStarted: true });+ renderRaise();++ const categories = await screen.findByRole(+ "group",+ {+ name: "What the expert works on",+ },+ { timeout: 5000 },+ );+ await userEvent.click(+ await within(categories).findByRole("button", { name: "Finance" }),+ );++ const titles = await screen.findByRole(+ "group",+ { name: "Suggested job titles" },+ { timeout: 5000 },+ );+ expect(+ within(titles).getByRole("button", { name: "Financial Analyst" }),+ ).toBeDefined();+ expect(loadDraft()).toMatchObject({+ category: "finance",+ color: "green-300",+ step: "jobTitle",+ });+ expect(requests).toHaveLength(0);+});++test("the avatar is generated in the area picked at the start", async () => {+ const requests: unknown[] = [];+ server.use(...generationHandlers(requests));+ seedAtAvatar("finance");+ renderRaise();++ await waitFor(() => expect(requests).toHaveLength(1));+ expect(requests[0]).toMatchObject({ category: "finance" });+});++test("the generated avatar is saved only after confirmation", async () => {+ server.use(...generationHandlers());+ seedAtAvatar("finance");+ renderRaise();++ await waitFor(() =>+ expect(+ screen.getByRole("img", { name: "Maria" }).getAttribute("src"),+ ).toContain("generated.png"),+ );expect(loadDraft().avatarUrl).toBeNull();+await userEvent.click(screen.getByRole("button", { name: "Use this avatar" }),);- await waitFor(() => expect(loadDraft().avatarUrl).toBe(general));- expect(loadDraft().color).toBe("violet-300");- expect(screen.queryByRole("group", { name: "Managed looks" })).toBeNull();+ await waitFor(() =>+ expect(loadDraft().avatarUrl).toBe("https://cdn.test/generated.png"),+ );+ expect(loadDraft().color).toBe("green-300");});-test("offers generation and uploads, never another Expert's face or a shade or accent choice", async () => {- await openPicker();- expect(- screen.getByRole("button", { name: "Generate with AI" }),- ).toBeDefined();+test("regenerating asks for another avatar in the same category", async () => {+ const requests: unknown[] = [];+ server.use(...generationHandlers(requests));+ seedAtAvatar("finance");+ renderRaise();++ await waitFor(() => expect(requests).toHaveLength(1));+ await userEvent.click(+ await screen.findByRole("button", { name: "Regenerate" }),+ );+ await waitFor(() => expect(requests).toHaveLength(2));+ expect(requests[1]).toMatchObject({ category: "finance" });+});++test("the picker offers upload and no face-part controls", async () => {+ server.use(...generationHandlers());+ seedAtAvatar("finance");+ renderRaise();+expect(- screen.getByRole("button", { name: "Upload a picture" }),+ await screen.findByRole("button", { name: "Upload a picture" }),).toBeDefined();- const looks = screen.getByRole("group", { name: "Managed looks" });- expect(looks.querySelectorAll("button")).toHaveLength(1);- expect(within(looks).queryByRole("button", { name: "Maria" })).toBeNull();- expect(screen.queryByRole("combobox", { name: "Shade" })).toBeNull();- expect(- screen.queryByRole("combobox", { name: "Accent placement" }),- ).toBeNull();- expect(screen.queryByRole("button", { name: "Next hair" })).toBeNull();- expect(screen.queryByRole("button", { name: "Lavender" })).toBeNull();+ expect(screen.queryByRole("group", { name: "Avatar catalog" })).toBeNull();+ expect(screen.queryByRole("combobox")).toBeNull();});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsxindex 28df8a4d23..d594ec5860 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx@@ -64,7 +64,7 @@ const raisedExpert = {id: "raised-1",name: "Otto",avatar_url: null,- role: "marketer",+ role: "Marketer",tagline: null,bio: null,skills: [],@@ -125,10 +125,10 @@ function seedAtBudget(name = "Otto") {saveDraft({step: "budget",hasStarted: true,- role: "marketer",+ category: "marketing",+ color: "rose-300",jobTitle: "Marketing Manager",name,- color: "rose-300",avatarUrl: "",about: "",voicePreferences: "",@@ -146,10 +146,10 @@ function seedAtSkills(saveDraft({step: "skills",hasStarted: true,- role: "marketer",+ category: "marketing",+ color: "rose-300",jobTitle: "Marketing Manager",name,- color: "rose-300",avatarUrl: "",about: "",voicePreferences: "",@@ -175,6 +175,43 @@ afterEach(() => {vi.clearAllMocks();});+test.each([null, "finance"])(+ "preserves a legacy custom role on submission with stored category %s",+ async (category) => {+ let captured: unknown = null;+ server.use(+ getCreateRaisedExpertMockHandler(async (info) => {+ captured = await info.request.json();+ return raiseResult();+ }),+ );+ seedAtSkills("Tally");+ window.sessionStorage.setItem(+ "raise-expert-draft",+ JSON.stringify({+ ...loadDraft(),+ category,+ role: "Invoice chaser",+ jobTitle: "Accounts Receivable Specialist",+ }),+ );+ saveDraft(loadDraft());+ renderRaise();++ await userEvent.click(+ await screen.findByRole("button", { name: "Skip" }, { timeout: 5000 }),+ );++ await waitFor(() =>+ expect(captured).toMatchObject({+ name: "Tally",+ role: "Invoice chaser",+ job_title: "Accounts Receivable Specialist",+ }),+ );+ },+);+test("calls notFound when the experts feature is disabled", () => {setFlagStatusMock.mockReturnValue({ enabled: false, ready: true });@@ -205,7 +242,7 @@ test("skips remaining kit steps, posts null budget and empty attachments, and opawait waitFor(() => expect(captured).not.toBeNull());expect(captured).toMatchObject({name: "Otto",- role: "marketer",+ role: "Marketer",job_title: "Marketing Manager",weekly_budget: null,attachments: [],@@ -379,7 +416,8 @@ test("picking a job title records it and asks for a name", async () => {saveDraft({...EMPTY_DRAFT,hasStarted: true,- role: "marketer",+ category: "marketing",+ color: "rose-300",step: "jobTitle",});renderRaise();@@ -408,7 +446,8 @@ test("typing a job title trims it and asks for a name", async () => {saveDraft({...EMPTY_DRAFT,hasStarted: true,- role: "Custom role",+ category: "research",+ color: "lime-300",step: "jobTitle",});renderRaise();@@ -435,7 +474,8 @@ test("skipping a job title records it and asks for a name", async () => {saveDraft({...EMPTY_DRAFT,hasStarted: true,- role: "marketer",+ category: "marketing",+ color: "rose-300",step: "jobTitle",});renderRaise();@@ -587,7 +627,7 @@ test("back returns to the previous step and the draft survives", async () => {expect(draft.voiceLabel).toBeNull();expect(draft).toMatchObject({hasStarted: true,- role: "marketer",+ category: "marketing",jobTitle: "Marketing Manager",name: "Otto",color: "rose-300",diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsxindex 459c1cd96c..6071514668 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx@@ -63,12 +63,12 @@ afterEach(() => {test("renders restored conversation messages instantly after reload", async () => {saveDraft({- step: "avatar",+ step: "name",hasStarted: true,- role: "marketer",+ category: "marketing",+ color: "rose-300",jobTitle: "Marketing Manager",- name: "Nova",- color: null,+ name: "",avatarUrl: null,about: null,voicePreferences: "",@@ -98,7 +98,7 @@ test("renders restored conversation messages instantly after reload", async () =).toBe(true);expect(visible.some((text) =>- text.includes("First — what should your expert do for you?"),+ text.includes("First — which area should your expert work in?"),),).toBe(true);expect(@@ -107,6 +107,6 @@ test("renders restored conversation messages instantly after reload", async () =),).toBe(true);expect(- visible.some((text) => text.includes("Now give Nova a face and a color.")),+ visible.some((text) => text.includes("And what's their job title?")),).toBe(true);});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/role-prefill.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/role-prefill.test.tsxindex 2bb70f83a3..89cce2fab7 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/role-prefill.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/role-prefill.test.tsx@@ -1,5 +1,6 @@import { render, screen } from "@/tests/integrations/test-utils";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import { colorForCategory } from "../components/CategoryStep/helpers";import { draftWithPrefilledRole, EMPTY_DRAFT, saveDraft } from "../helpers";import RaisePage from "../page";@@ -64,7 +65,7 @@ afterEach(() => {});describe("/raise?role= — the greeting page's raise door", () => {- it("opens on the job title question with the role already answered", async () => {+ it("opens on the job title question with the area already answered", async () => {searchParams.current = new URLSearchParams("role=support");render(<RaisePage />);@@ -76,7 +77,7 @@ describe("/raise?role= — the greeting page's raise door", () => {{ timeout: 5000 },),).toBeDefined();- // Support's job titles, so the role really did land in the draft.+ // Support's job titles, so the role's area really did land in the draft.expect(screen.getByRole("button", { name: "Customer Success Manager" }),).toBeDefined();@@ -86,7 +87,8 @@ describe("/raise?role= — the greeting page's raise door", () => {const inProgress = {...EMPTY_DRAFT,hasStarted: true,- role: "marketer",+ category: "marketing" as const,+ color: "orange-300",jobTitle: "Marketing Manager",name: "Nova",step: "avatar" as const,@@ -96,18 +98,19 @@ describe("/raise?role= — the greeting page's raise door", () => {expect(draftWithPrefilledRole(inProgress, "support")).toEqual(inProgress);});- it("ignores a role the wizard cannot use", () => {+ it("ignores a role outside the wizard's role ids", () => {expect(draftWithPrefilledRole(EMPTY_DRAFT, "")).toEqual(EMPTY_DRAFT);- expect(draftWithPrefilledRole(EMPTY_DRAFT, "x".repeat(101))).toEqual(+ expect(draftWithPrefilledRole(EMPTY_DRAFT, "Chief of staff")).toEqual(EMPTY_DRAFT,);});- it("keeps a free-text role the wizard would have accepted by hand", () => {- expect(draftWithPrefilledRole(EMPTY_DRAFT, " Chief of staff ")).toEqual({+ it("answers the area and its color from the role", () => {+ expect(draftWithPrefilledRole(EMPTY_DRAFT, "analyst")).toEqual({...EMPTY_DRAFT,hasStarted: true,- role: "Chief of staff",+ category: "finance",+ color: colorForCategory("finance"),step: "jobTitle",});});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/AboutStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/AboutStep.tsxindex d8b3149b18..af972221ff 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/AboutStep.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/AboutStep.tsx@@ -7,7 +7,7 @@ import { cn } from "@/lib/utils";import { Forward02Icon } from "@hugeicons/core-free-icons";import { useState } from "react";import { bubbleClassFor } from "../ColorStep/helpers";-import { aboutPlaceholderFor } from "../RoleStep/helpers";+import { aboutPlaceholderFor } from "./helpers";interface Props {submittedAbout: string | null;diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.test.tsnew file mode 100644index 0000000000..405cf2cb6c--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.test.ts@@ -0,0 +1,22 @@+import { describe, expect, test } from "vitest";+import { aboutPlaceholderFor } from "./helpers";++describe("aboutPlaceholderFor", () => {+ test("returns a generic placeholder without a name", () => {+ expect(aboutPlaceholderFor(null)).toBe(+ "How they should work, what you care about, anything that helps them sound like yours…",+ );+ expect(aboutPlaceholderFor(" ")).toBe(+ "How they should work, what you care about, anything that helps them sound like yours…",+ );+ });++ test("personalizes the placeholder with the expert name", () => {+ expect(aboutPlaceholderFor("Nova")).toBe(+ "How Nova should work, what you care about, anything that helps them sound like yours…",+ );+ expect(aboutPlaceholderFor(" Ada ")).toBe(+ "How Ada should work, what you care about, anything that helps them sound like yours…",+ );+ });+});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.tsnew file mode 100644index 0000000000..33fa18ee29--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/AboutStep/helpers.ts@@ -0,0 +1,8 @@+const ABOUT_PLACEHOLDER =+ "How they should work, what you care about, anything that helps them sound like yours…";++export function aboutPlaceholderFor(name: string | null) {+ const trimmed = name?.trim();+ if (!trimmed) return ABOUT_PLACEHOLDER;+ return `How ${trimmed} should work, what you care about, anything that helps them sound like yours…`;+}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsxindex 739962cd2e..e8b81335f2 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx@@ -1,18 +1,26 @@"use client";-import { cn } from "@/lib/utils";+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import { ExpertAvatar } from "@/components/molecules/ExpertAvatar/ExpertAvatar";-import { bubbleClassFor } from "../ColorStep/helpers";import { ExpertAvatarPicker } from "@/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker";+import { cn } from "@/lib/utils";+import { bubbleClassFor } from "../ColorStep/helpers";interface Props {name: string;+ category: ExpertAvatarRequestCategory;color: string | null;avatarUrl: string | null;- onPick: (avatarUrl: string, colorId: string) => void;+ onPick: (avatarUrl: string) => void;}-export function AvatarStep({ name, color, avatarUrl, onPick }: Props) {+export function AvatarStep({+ name,+ category,+ color,+ avatarUrl,+ onPick,+}: Props) {if (avatarUrl) {return (<div@@ -33,5 +41,12 @@ export function AvatarStep({ name, color, avatarUrl, onPick }: Props) {);}- return <ExpertAvatarPicker name={name} color={color} onPick={onPick} />;+ return (+ <ExpertAvatarPicker+ name={name}+ category={category}+ autoGenerate+ onPick={onPick}+ />+ );}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/CategoryStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/CategoryStep.tsxnew file mode 100644index 0000000000..4505b031e0--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/CategoryStep.tsx@@ -0,0 +1,47 @@+"use client";++import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { cn } from "@/lib/utils";+import { bubbleClassFor } from "../ColorStep/helpers";+import { categoryOptionsForSelection } from "./helpers";++interface Props {+ selectedCategory: ExpertAvatarRequestCategory | null;+ color: string | null;+ onPick: (category: ExpertAvatarRequestCategory) => void;+}++export function CategoryStep({ selectedCategory, color, onPick }: Props) {+ const options = categoryOptionsForSelection(selectedCategory);++ return (+ <div+ role="group"+ aria-label="What the expert works on"+ className="flex flex-wrap justify-end gap-2.5"+ >+ {options.map((option) => (+ <button+ key={option.id}+ type="button"+ onClick={() => onPick(option.id)}+ disabled={Boolean(selectedCategory)}+ aria-pressed={selectedCategory ? true : undefined}+ className={cn(+ "flex items-center gap-2 rounded-full border px-5 py-2.5 text-sm font-medium text-foreground transition-colors",+ selectedCategory+ ? (bubbleClassFor(color) ?? "border-accent bg-accent/5")+ : "border-border bg-background hover:border-accent hover:bg-accent/5",+ )}+ >+ <span+ aria-hidden+ className="size-3 shrink-0 rounded-full"+ style={{ backgroundColor: option.hex }}+ />+ {option.label}+ </button>+ ))}+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.test.tsnew file mode 100644index 0000000000..a63d0ce065--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.test.ts@@ -0,0 +1,40 @@+import { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { describe, expect, test } from "vitest";+import {+ categoryForRole,+ jobTitleSuggestionsFor,+ nameSuggestionsFor,+ roleFor,+} from "./helpers";++describe("category helpers", () => {+ test("maps the wizard's role ids onto their area", () => {+ expect(categoryForRole("marketer")).toBe("marketing");+ expect(categoryForRole("developer")).toBe("development");+ expect(categoryForRole("analyst")).toBe("finance");+ expect(categoryForRole("recruiter")).toBe("operations");+ });++ test("returns null for a role outside the wizard's ids", () => {+ expect(categoryForRole("Chief of staff")).toBeNull();+ });++ test.each(Object.values(ExpertAvatarRequestCategory))(+ "gives %s a role, names and job titles",+ (category) => {+ expect(roleFor(category)).toBeTruthy();+ expect(nameSuggestionsFor(category)).not.toHaveLength(0);+ expect(jobTitleSuggestionsFor(category)).not.toHaveLength(0);+ },+ );++ test("keeps the recruiter titles under operations", () => {+ expect(jobTitleSuggestionsFor("operations")).toContain("Recruiter");+ });++ test("falls back when no area is picked", () => {+ expect(roleFor(null)).toBeNull();+ expect(nameSuggestionsFor(null)).toEqual(["Otto", "Nova", "Juno"]);+ expect(jobTitleSuggestionsFor(null)).toEqual([]);+ });+});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.tsnew file mode 100644index 0000000000..23ccf6f663--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/CategoryStep/helpers.ts@@ -0,0 +1,170 @@+import { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { EXPERT_PALETTE } from "@/components/molecules/ExpertAvatar/helpers";++interface CategoryDetails {+ label: string;+ color: string;+ // Saved as the expert's role, so the intro reads "I'm Curie, your Researcher".+ role: string;+ // Seeds the name step, so suggestions fit the area the expert works in.+ nameSuggestions: string[];+ jobTitleSuggestions: string[];+}++const CATEGORY_DETAILS: Record<ExpertAvatarRequestCategory, CategoryDetails> = {+ general: {+ label: "General",+ color: "amber-300",+ role: "Assistant",+ nameSuggestions: ["Otto", "Nova", "Juno"],+ jobTitleSuggestions: ["Executive Assistant", "Personal Assistant"],+ },+ marketing: {+ color: "orange-300",+ label: "Marketing",+ role: "Marketer",+ nameSuggestions: ["Echo", "Reach", "Nova"],+ jobTitleSuggestions: [+ "Marketing Manager",+ "Growth Marketer",+ "Content Marketer",+ ],+ },+ sales: {+ color: "amber-300",+ label: "Sales",+ role: "Sales",+ nameSuggestions: ["Pitch", "Ace", "Rain"],+ jobTitleSuggestions: [+ "Sales Development Rep",+ "Account Executive",+ "Sales Manager",+ ],+ },+ finance: {+ color: "green-300",+ label: "Finance",+ role: "Analyst",+ nameSuggestions: ["Tally", "Vector", "Sigma"],+ jobTitleSuggestions: [+ "Financial Analyst",+ "Data Analyst",+ "Business Analyst",+ ],+ },+ support: {+ color: "rose-300",+ label: "Support",+ role: "Support",+ nameSuggestions: ["Remy", "Aide", "Piper"],+ jobTitleSuggestions: [+ "Support Specialist",+ "Customer Success Manager",+ "Support Engineer",+ ],+ },+ operations: {+ color: "sky-300",+ label: "Operations",+ role: "Operations",+ nameSuggestions: ["Cadence", "Clockwork", "Scout"],+ jobTitleSuggestions: [+ "Operations Manager",+ "Executive Assistant",+ "Recruiter",+ ],+ },+ research: {+ color: "lime-300",+ label: "Research",+ role: "Researcher",+ nameSuggestions: ["Kepler", "Curie", "Juno"],+ jobTitleSuggestions: [+ "Research Analyst",+ "Market Researcher",+ "UX Researcher",+ ],+ },+ content: {+ color: "amber-300",+ label: "Content",+ role: "Writer",+ nameSuggestions: ["Quill", "Hemingway", "Ink"],+ jobTitleSuggestions: ["Content Writer", "Copywriter", "Technical Writer"],+ },+ development: {+ color: "blue-300",+ label: "Development",+ role: "Developer",+ nameSuggestions: ["Ada", "Turing", "Bit"],+ jobTitleSuggestions: [+ "Software Engineer",+ "Full-Stack Developer",+ "DevOps Engineer",+ ],+ },+};++// The role ids a `/raise?role=` link can carry; keep in step with the+// backend's RAISE_ROLES in onboarding_dump/recommend_experts.py.+const ROLE_CATEGORIES = new Map<string, ExpertAvatarRequestCategory>([+ ["marketer", "marketing"],+ ["sales", "sales"],+ ["developer", "development"],+ ["researcher", "research"],+ ["writer", "content"],+ ["analyst", "finance"],+ ["recruiter", "operations"],+ ["support", "support"],+ ["operations", "operations"],+]);++const FALLBACK_NAMES = ["Otto", "Nova", "Juno"];++export interface CategoryOption {+ id: ExpertAvatarRequestCategory;+ label: string;+ hex: string;+}++export const CATEGORY_OPTIONS: CategoryOption[] = Object.values(+ ExpertAvatarRequestCategory,+)+ .filter((id) => id !== "general")+ .map((id) => ({+ id,+ label: CATEGORY_DETAILS[id].label,+ hex: EXPERT_PALETTE[id].hex,+ }));++export function categoryOptionsForSelection(+ selected: ExpertAvatarRequestCategory | null,+) {+ if (!selected) return CATEGORY_OPTIONS;+ return CATEGORY_OPTIONS.filter((option) => option.id === selected);+}++/** The wizard color a category answers for, used from the first beat onwards. */+export function colorForCategory(category: ExpertAvatarRequestCategory) {+ return CATEGORY_DETAILS[category].color;+}++export function categoryForRole(role: string) {+ return ROLE_CATEGORIES.get(role) ?? null;+}++export function roleFor(category: ExpertAvatarRequestCategory | null) {+ return category ? CATEGORY_DETAILS[category].role : null;+}++export function nameSuggestionsFor(+ category: ExpertAvatarRequestCategory | null,+) {+ return category ? CATEGORY_DETAILS[category].nameSuggestions : FALLBACK_NAMES;+}++export function jobTitleSuggestionsFor(+ category: ExpertAvatarRequestCategory | null,+) {+ return category ? CATEGORY_DETAILS[category].jobTitleSuggestions : [];+}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/RaiseFlow.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/RaiseFlow.tsxindex 5488ff4644..48f0bece20 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/RaiseFlow.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/RaiseFlow.tsx@@ -33,7 +33,7 @@ export function RaiseFlow() {hasStarted,items,name,- role,+ category,jobTitle,color,avatarUrl,@@ -139,7 +139,7 @@ export function RaiseFlow() {<div className="relative flex h-full items-center justify-center p-4 sm:p-6"><SoulPreviewPanelname={name}- role={role}+ category={category}jobTitle={jobTitle}avatarUrl={avatarUrl || null}color={color}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/components/BeatControl.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/components/BeatControl.tsxindex aeb0eb9870..94714e80ed 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/components/BeatControl.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/RaiseFlow/components/BeatControl.tsx@@ -7,6 +7,11 @@ import type { useRaisePage } from "../../../useRaisePage";import { AboutStep } from "../../AboutStep/AboutStep";import { AvatarStep } from "../../AvatarStep/AvatarStep";import { BudgetStep } from "../../BudgetStep/BudgetStep";+import { CategoryStep } from "../../CategoryStep/CategoryStep";+import {+ jobTitleSuggestionsFor,+ nameSuggestionsFor,+} from "../../CategoryStep/helpers";import {interactiveCardClassFor,selectedCardClassFor,@@ -15,11 +20,6 @@ import {import { JobTitleStep } from "../../JobTitleStep/JobTitleStep";import { MarketplaceStep } from "../../MarketplaceStep/MarketplaceStep";import { NameStep } from "../../NameStep/NameStep";-import {- jobTitleSuggestionsFor,- nameSuggestionsFor,-} from "../../RoleStep/helpers";-import { RoleStep } from "../../RoleStep/RoleStep";import { SkillsStep } from "../../SkillsStep/SkillsStep";interface Props {@@ -29,19 +29,19 @@ interface Props {export function BeatControl({ beat, flow }: Props) {switch (beat) {- case "role":+ case "category":return (- <RoleStep- selectedRole={flow.role}+ <CategoryStep+ selectedCategory={flow.category}color={flow.color}- onPick={flow.pickRole}+ onPick={flow.pickCategory}/>);case "jobTitle":return (<JobTitleStepselectedTitle={flow.jobTitle}- suggestions={jobTitleSuggestionsFor(flow.role)}+ suggestions={jobTitleSuggestionsFor(flow.category)}color={flow.color}onSubmit={flow.submitJobTitle}onSkip={flow.skipJobTitle}@@ -51,15 +51,18 @@ export function BeatControl({ beat, flow }: Props) {return (<NameStepselectedName={flow.name || null}- suggestions={nameSuggestionsFor(flow.role)}+ suggestions={nameSuggestionsFor(flow.category)}color={flow.color}onSubmit={flow.submitName}/>);case "avatar":+ // The avatar beat only opens once the area is answered.+ if (!flow.category) return null;return (<AvatarStepname={flow.name}+ category={flow.category}color={flow.color}avatarUrl={flow.avatarUrl || null}onPick={flow.pickAvatar}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.test.tsxdeleted file mode 100644index fac7a98839..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.test.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { render, screen } from "@/tests/integrations/test-utils";-import userEvent from "@testing-library/user-event";-import { describe, expect, test, vi } from "vitest";-import { RoleStep } from "./RoleStep";--describe("RoleStep", () => {- test("does not show Something else as a preset pill", () => {- render(<RoleStep selectedRole={null} color={null} onPick={vi.fn()} />);-- expect(screen.queryByRole("button", { name: "Something else" })).toBeNull();- expect(screen.getByPlaceholderText("Type a role…")).toBeDefined();- });-- test("submits trimmed custom role text", async () => {- const onPick = vi.fn();- render(<RoleStep selectedRole={null} color={null} onPick={onPick} />);-- await userEvent.type(- screen.getByPlaceholderText("Type a role…"),- " UX Designer ",- );- await userEvent.click(screen.getByRole("button", { name: "Add role" }));-- expect(onPick).toHaveBeenCalledWith("UX Designer");- });-- test("collapses to the selected custom role", () => {- render(- <RoleStep selectedRole="UX Designer" color={null} onPick={vi.fn()} />,- );-- expect(screen.getByRole("button", { name: "UX Designer" })).toBeDefined();- expect(screen.queryByPlaceholderText("Type a role…")).toBeNull();- });-});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.tsxdeleted file mode 100644index b0608ec82d..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/RoleStep.tsx+++ /dev/null@@ -1,81 +0,0 @@-"use client";--import { Button } from "@/components/atoms/Button/Button";-import { Input } from "@/components/atoms/Input/Input";-import { cn } from "@/lib/utils";-import { bubbleClassFor } from "../ColorStep/helpers";-import { CUSTOM_ROLE_MAX_LENGTH, roleOptionsForSelection } from "./helpers";-import { useRoleStep } from "./useRoleStep";--interface Props {- selectedRole: string | null;- color: string | null;- onPick: (roleId: string) => void;-}--export function RoleStep({ selectedRole, color, onPick }: Props) {- const { custom, setCustom, trimmed, submitCustom } = useRoleStep({- onPick,- });- const options = roleOptionsForSelection(selectedRole);-- return (- <div className="flex flex-col items-end gap-4">- <div- role="group"- aria-label="What the expert does"- className="flex flex-wrap justify-end gap-2.5"- >- {options.map((option) => (- <button- key={option.id}- type="button"- onClick={() => onPick(option.id)}- disabled={Boolean(selectedRole)}- aria-pressed={selectedRole ? true : undefined}- className={cn(- "rounded-full border px-5 py-2.5 text-sm font-medium text-foreground transition-colors",- selectedRole- ? (bubbleClassFor(color) ?? "border-accent bg-accent/5")- : "border-border bg-background hover:border-accent hover:bg-accent/5",- )}- >- {option.label}- </button>- ))}- </div>- {selectedRole ? null : (- <span- aria-hidden- className="mr-4 text-xs font-medium uppercase tracking-[0.12em] text-muted-foreground"- >- or- </span>- )}- {selectedRole ? null : (- <form onSubmit={submitCustom} className="flex items-center gap-2">- <Input- id="raise-role"- label="Or type your own"- hideLabel- size="small"- value={custom}- onChange={(event) => setCustom(event.target.value)}- placeholder="Type a role…"- maxLength={CUSTOM_ROLE_MAX_LENGTH}- wrapperClassName="mb-0 w-full max-w-[16rem] [&_input]:h-[2.625rem] [&_input]:py-3"- />- <Button- type="submit"- variant="primary"- size="small"- disabled={!trimmed}- className="h-[2.625rem] rounded-xl py-3"- >- Add role- </Button>- </form>- )}- </div>- );-}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.test.tsdeleted file mode 100644index 83cc49efa8..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.test.ts+++ /dev/null@@ -1,56 +0,0 @@-import { describe, expect, test } from "vitest";-import {- aboutPlaceholderFor,- CUSTOM_ROLE_MAX_LENGTH,- isValidCustomRole,- normalizeCustomRole,- roleLabelFor,- roleOptionsForSelection,-} from "./helpers";--describe("RoleStep helpers", () => {- test("roleLabelFor returns preset labels", () => {- expect(roleLabelFor("marketer")).toBe("Marketer");- });-- test("roleLabelFor returns custom role text", () => {- expect(roleLabelFor("UX Designer")).toBe("UX Designer");- });-- test("roleOptionsForSelection collapses to a custom role chip", () => {- expect(roleOptionsForSelection("UX Designer")).toEqual([- { id: "UX Designer", label: "UX Designer" },- ]);- });-- test("normalizeCustomRole trims whitespace", () => {- expect(normalizeCustomRole(" Coach ")).toBe("Coach");- });-- test("isValidCustomRole rejects empty and overlong values", () => {- expect(isValidCustomRole("")).toBe(false);- expect(isValidCustomRole(" ")).toBe(false);- expect(isValidCustomRole("a".repeat(CUSTOM_ROLE_MAX_LENGTH))).toBe(true);- expect(isValidCustomRole("a".repeat(CUSTOM_ROLE_MAX_LENGTH + 1))).toBe(- false,- );- });-- test("aboutPlaceholderFor returns a generic placeholder without a name", () => {- expect(aboutPlaceholderFor(null)).toBe(- "How they should work, what you care about, anything that helps them sound like yours…",- );- expect(aboutPlaceholderFor(" ")).toBe(- "How they should work, what you care about, anything that helps them sound like yours…",- );- });-- test("aboutPlaceholderFor personalizes the placeholder with the expert name", () => {- expect(aboutPlaceholderFor("Nova")).toBe(- "How Nova should work, what you care about, anything that helps them sound like yours…",- );- expect(aboutPlaceholderFor(" Ada ")).toBe(- "How Ada should work, what you care about, anything that helps them sound like yours…",- );- });-});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.tsdeleted file mode 100644index 967180d9af..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/helpers.ts+++ /dev/null@@ -1,137 +0,0 @@-export interface RoleOption {- id: string;- label: string;- // Seeds the name step, so suggestions fit the job the expert was hired for.- nameSuggestions: string[];- jobTitleSuggestions: string[];-}--const FALLBACK_NAMES = ["Otto", "Nova", "Juno"];-const ABOUT_PLACEHOLDER =- "How they should work, what you care about, anything that helps them sound like yours…";--export const CUSTOM_ROLE_MAX_LENGTH = 100;--export const ROLE_OPTIONS: RoleOption[] = [- {- id: "marketer",- label: "Marketer",- nameSuggestions: ["Echo", "Reach", "Nova"],- jobTitleSuggestions: [- "Marketing Manager",- "Growth Marketer",- "Content Marketer",- ],- },- {- id: "sales",- label: "Sales",- nameSuggestions: ["Pitch", "Ace", "Rain"],- jobTitleSuggestions: [- "Sales Development Rep",- "Account Executive",- "Sales Manager",- ],- },- {- id: "developer",- label: "Developer",- nameSuggestions: ["Ada", "Turing", "Bit"],- jobTitleSuggestions: [- "Software Engineer",- "Full-Stack Developer",- "DevOps Engineer",- ],- },- {- id: "researcher",- label: "Researcher",- nameSuggestions: ["Kepler", "Curie", "Juno"],- jobTitleSuggestions: [- "Research Analyst",- "Market Researcher",- "UX Researcher",- ],- },- {- id: "writer",- label: "Writer",- nameSuggestions: ["Quill", "Hemingway", "Ink"],- jobTitleSuggestions: ["Content Writer", "Copywriter", "Technical Writer"],- },- {- id: "analyst",- label: "Analyst",- nameSuggestions: ["Tally", "Vector", "Sigma"],- jobTitleSuggestions: [- "Data Analyst",- "Business Analyst",- "Financial Analyst",- ],- },- {- id: "recruiter",- label: "Recruiter",- nameSuggestions: ["Scout", "Hire", "Vera"],- jobTitleSuggestions: ["Recruiter", "Talent Sourcer", "Hiring Coordinator"],- },- {- id: "support",- label: "Support",- nameSuggestions: ["Remy", "Aide", "Piper"],- jobTitleSuggestions: [- "Support Specialist",- "Customer Success Manager",- "Support Engineer",- ],- },- {- id: "operations",- label: "Operations",- nameSuggestions: ["Cadence", "Clockwork", "Sol"],- jobTitleSuggestions: [- "Operations Manager",- "Executive Assistant",- "Project Coordinator",- ],- },-];--export function normalizeCustomRole(value: string) {- return value.trim();-}--export function isValidCustomRole(value: string) {- const trimmed = normalizeCustomRole(value);- return trimmed.length > 0 && trimmed.length <= CUSTOM_ROLE_MAX_LENGTH;-}--export function findRoleOption(id: string | null) {- return ROLE_OPTIONS.find((option) => option.id === id) ?? null;-}--export function roleLabelFor(role: string | null) {- if (!role) return null;- return findRoleOption(role)?.label ?? role;-}--export function roleOptionsForSelection(selectedRole: string | null) {- if (!selectedRole) return ROLE_OPTIONS;- const preset = findRoleOption(selectedRole);- if (preset) return [preset];- return [{ id: selectedRole, label: selectedRole }];-}--export function nameSuggestionsFor(roleId: string | null) {- return findRoleOption(roleId)?.nameSuggestions ?? FALLBACK_NAMES;-}--export function jobTitleSuggestionsFor(roleId: string | null) {- return findRoleOption(roleId)?.jobTitleSuggestions ?? [];-}--export function aboutPlaceholderFor(name: string | null) {- const trimmed = name?.trim();- if (!trimmed) return ABOUT_PLACEHOLDER;- return `How ${trimmed} should work, what you care about, anything that helps them sound like yours…`;-}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/useRoleStep.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/useRoleStep.tsdeleted file mode 100644index 9939f39001..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/RoleStep/useRoleStep.ts+++ /dev/null@@ -1,20 +0,0 @@-import type { FormEvent } from "react";-import { useState } from "react";-import { isValidCustomRole, normalizeCustomRole } from "./helpers";--interface Args {- onPick: (roleId: string) => void;-}--export function useRoleStep({ onPick }: Args) {- const [custom, setCustom] = useState("");- const trimmed = normalizeCustomRole(custom);-- function submitCustom(event: FormEvent) {- event.preventDefault();- if (!isValidCustomRole(custom)) return;- onPick(trimmed);- }-- return { custom, setCustom, trimmed, submitCustom };-}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.test.tsxindex 1ee0ee58dc..448e205932 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.test.tsx@@ -3,7 +3,7 @@ import { describe, expect, test } from "vitest";import { SoulPreviewPanel } from "./SoulPreviewPanel";const baseProps = {- role: null,+ category: null,avatarUrl: null,color: null,about: null,diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.tsxindex 8d2f8eb1c5..53cdf1b725 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/SoulPreviewPanel/SoulPreviewPanel.tsx@@ -1,11 +1,12 @@"use client";+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import { GlassOrb } from "@/components/molecules/GlassOrb/GlassOrb";import { DEFAULT_GLASS_PARAMS } from "@/components/molecules/GlassOrb/GlassSurface";import { cn } from "@/lib/utils";import Image from "next/image";import { kitBudgetLabel, kitToolsLabel, type RaiseKit } from "../../helpers";-import { roleLabelFor } from "../RoleStep/helpers";+import { roleFor } from "../CategoryStep/helpers";import { SoulDetailCard } from "./SoulDetailCard";const REVEAL =@@ -18,7 +19,7 @@ type SoulDetail = {interface Props {name: string;- role: string | null;+ category: ExpertAvatarRequestCategory | null;jobTitle?: string | null;avatarUrl: string | null;color: string | null;@@ -31,7 +32,7 @@ interface Props {// Answers stack beneath it, which pushes the identity card up as they land.export function SoulPreviewPanel({name,- role,+ category,jobTitle,avatarUrl,color,@@ -39,7 +40,7 @@ export function SoulPreviewPanel({voiceLabel,kit,}: Props) {- const roleLabel = jobTitle || roleLabelFor(role);+ const roleLabel = jobTitle || roleFor(category);const details = [{ label: "About", value: about },{ label: "Voice", value: voiceLabel },diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.test.tsnew file mode 100644index 0000000000..173b5fa2f5--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.test.ts@@ -0,0 +1,12 @@+import { describe, expect, test } from "vitest";+import { clearedAnswer } from "./flowItems";++describe("clearedAnswer", () => {+ test("drops a restored custom role when reopening the category beat", () => {+ expect(clearedAnswer("category")).toStrictEqual({+ category: null,+ color: null,+ legacyRole: undefined,+ });+ });+});diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.ts b/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.tsindex 13034520a5..a13419a2d8 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.ts+++ b/autogpt_platform/frontend/src/app/(platform)/raise/flowItems.ts@@ -3,7 +3,7 @@ import { RAISE_PROMPTS, type RaiseDraft } from "./helpers";// One beat per question: the question waits for the previous answer, and the// controls it introduces wait for the question to finish typing.export const BEAT_KEYS = [- "role",+ "category","jobTitle","name","avatar",@@ -43,7 +43,7 @@ export function buildFlowItems(];const questions: Record<BeatKey, string> = {- role: RAISE_PROMPTS.roleQuestion,+ category: RAISE_PROMPTS.categoryQuestion,jobTitle: RAISE_PROMPTS.jobTitleQuestion,name: RAISE_PROMPTS.nameQuestion,avatar: RAISE_PROMPTS.avatarQuestion(draft.name),@@ -87,8 +87,8 @@ export function beatTriggers(hasSkillsBeat: boolean,): Record<BeatKey, boolean> {return {- role: draft.hasStarted,- jobTitle: draft.role !== null,+ category: draft.hasStarted,+ jobTitle: draft.category !== null,name: draft.jobTitle !== null,avatar: draft.name !== "",about: draft.avatarUrl !== null,@@ -101,7 +101,7 @@ export function beatTriggers(function beatAnswers(draft: RaiseDraft): Record<BeatKey, boolean> {return {- role: draft.role !== null,+ category: draft.category !== null,jobTitle: draft.jobTitle !== null,name: draft.name !== "",avatar: draft.avatarUrl !== null,@@ -122,15 +122,15 @@ export function lastAnsweredBeat(draft: RaiseDraft): BeatKey | null {// disappears on its own because the stream is derived from the answers.export function clearedAnswer(beat: BeatKey): Partial<RaiseDraft> {switch (beat) {- case "role":- return { role: null };+ case "category":+ // The color is answered in the same beat, so going back re-opens both.+ return { category: null, color: null, legacyRole: undefined };case "jobTitle":return { jobTitle: null };case "name":return { name: "" };case "avatar":- // Colour is answered in the same beat, so going back re-opens both.- return { avatarUrl: null, color: null };+ return { avatarUrl: null };case "about":return { about: null };case "voice":diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.tsindex b9a783dd7f..f054db4542 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts+++ b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts@@ -14,6 +14,7 @@ import {VOICE_SKIPPED_LABEL,voiceSummaryLabel,} from "./helpers";+import { colorForCategory } from "./components/CategoryStep/helpers";const samples: VoiceSample[] = [{ label: "Direct", text: "Do this next." },@@ -139,15 +140,83 @@ describe("restoring a persisted draft", () => {expect(loadDraft().voiceLabel).toBe("Direct");});+ test("answers the area from the role an earlier draft was started with", () => {+ saveDraftFromEarlierBuild({+ hasStarted: true,+ role: "marketer",+ color: "rose-300",+ jobTitle: "Marketing Manager",+ name: "Nova",+ avatarUrl: "",+ step: "about",+ });++ const draft = loadDraft();+ expect(draft).toMatchObject({+ category: "marketing",+ color: "rose-300",+ step: "about",+ });+ expect(draft).not.toHaveProperty("role");+ });++ test("reads a typed role for its area and colors the draft to match", () => {+ saveDraftFromEarlierBuild({+ hasStarted: true,+ role: "Invoice chaser",+ jobTitle: "",+ step: "name",+ });++ expect(loadDraft()).toMatchObject({+ category: "finance",+ color: colorForCategory("finance"),+ step: "name",+ });+ });++ test("keeps a custom role when reopening a draft without a job title", () => {+ saveDraftFromEarlierBuild({ role: "Invoice chaser", step: "avatar" });++ const draft = loadDraft();+ expect(draft).toMatchObject({+ step: "jobTitle",+ category: "finance",+ legacyRole: "Invoice chaser",+ });+ saveDraft(draft);+ expect(loadDraft()).toEqual(draft);+ });++ test("moves a draft parked on the old area beat on to the avatar", () => {+ saveDraftFromEarlierBuild({+ hasStarted: true,+ role: "marketer",+ jobTitle: "Marketing Manager",+ name: "Nova",+ step: "category",+ });++ expect(loadDraft()).toMatchObject({+ category: "marketing",+ step: "avatar",+ });+ });++ test("opens a draft still on the retired role question at the area beat", () => {+ saveDraftFromEarlierBuild({ hasStarted: true, role: null, step: "role" });++ expect(loadDraft()).toMatchObject({ category: null, step: "category" });+ });+test("moves a draft parked on the retired kit step onto budget", () => {- saveStepFromEarlierBuild("kit");+ saveDraftFromEarlierBuild({ step: "kit" });expect(loadDraft().step).toBe("budget");});test("sends a draft from before the job title beat back to that beat", () => {- saveDraft({- ...EMPTY_DRAFT,+ saveDraftFromEarlierBuild({hasStarted: true,role: "marketer",name: "Nova",@@ -157,18 +226,19 @@ describe("restoring a persisted draft", () => {expect(loadDraft()).toEqual({...EMPTY_DRAFT,hasStarted: true,- role: "marketer",+ category: "marketing",+ color: colorForCategory("marketing"),step: "jobTitle",});});test("restarts the flow when the stored step is not a known step", () => {- saveStepFromEarlierBuild("space-invaders");+ saveDraftFromEarlierBuild({ step: "space-invaders" });expect(loadDraft().step).toBe(EMPTY_DRAFT.step);});});-function saveStepFromEarlierBuild(step: string) {- saveDraft({ ...EMPTY_DRAFT, step } as RaiseDraft);+function saveDraftFromEarlierBuild(fields: object) {+ saveDraft({ ...EMPTY_DRAFT, ...fields } as RaiseDraft);}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.tsindex d41c979ffd..de8f7e6fa8 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts@@ -1,17 +1,18 @@+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import type { VoiceSample } from "@/app/api/__generated__/models/voiceSample";+import { legacyCategoryForRole } from "./legacyCategory";import { creditsToUsdLabel } from "@/lib/credits";import {buildVoicePreferences,type VoicePickResult,} from "@/components/organisms/VoicePicker/helpers";import {- findRoleOption,- isValidCustomRole,- normalizeCustomRole,-} from "./components/RoleStep/helpers";+ categoryForRole,+ colorForCategory,+} from "./components/CategoryStep/helpers";export type RaiseStep =- | "role"+ | "category"| "jobTitle"| "name"| "avatar"@@ -23,7 +24,7 @@ export type RaiseStep =| "done";export const STEP_ORDER: RaiseStep[] = [- "role",+ "category","jobTitle","name","avatar",@@ -61,11 +62,12 @@ export const VOICE_SAMPLES: VoiceSample[] = [export const RAISE_PROMPTS = {greeting: "Hello, I'm Otto. I'll help you create your own AI Expert.",- roleQuestion: "First — what should your expert do for you?",+ categoryQuestion:+ "First — which area should your expert work in? It sets their color.",jobTitleQuestion: "And what's their job title?",nameQuestion: "Good pick. What do you want to call them?",avatarQuestion: (name: string) =>- `Now give ${name || "them"} a face and a color. Shuffle until one feels right, or upload a picture.`,+ `I'm sculpting a face for ${name || "them"}. Regenerate until one feels right, or upload a picture.`,aboutQuestion: (name: string) =>`Anything else I should know about ${name || "your expert"}? How they should work, what matters to you — or skip it.`,voiceQuestion: (name: string) =>@@ -87,10 +89,12 @@ export const VOICE_SKIPPED_LABEL = "I'll decide the voice later";export interface RaiseDraft {step: RaiseStep;hasStarted: boolean;- role: string | null;+ // Answers the color and the role too: every category owns one of each.+ category: ExpertAvatarRequestCategory | null;+ legacyRole?: string;+ color: string | null;jobTitle: string | null;name: string;- color: string | null;// "" once the user skips, so the question is not asked again on restore.avatarUrl: string | null;about: string | null;@@ -103,12 +107,12 @@ export interface RaiseDraft {}export const EMPTY_DRAFT: RaiseDraft = {- step: "role",+ step: "category",hasStarted: false,- role: null,+ category: null,+ color: null,jobTitle: null,name: "",- color: null,avatarUrl: null,about: null,voicePreferences: "",@@ -125,27 +129,39 @@ export function loadDraft(): RaiseDraft {try {const raw = window.sessionStorage.getItem(DRAFT_STORAGE_KEY);if (!raw) return EMPTY_DRAFT;- const parsed = JSON.parse(raw) as Omit<Partial<RaiseDraft>, "step"> & {- step?: string;- };- if (parsed.role && parsed.jobTitle == null) {- return reopenedAtJobTitle(parsed.role);- }+ const { role, ...parsed } = JSON.parse(raw) as StoredDraft;+ if (role && !categoryForRole(role)) parsed.legacyRole = role;+ if (role && parsed.jobTitle == null) return reopenedAtJobTitle(role);const step = migrateStep(parsed.step);- return backfillSkippedVoice({+ const draft = backfillSkippedVoice({...EMPTY_DRAFT,...parsed,step: isRaiseStep(step) ? step : EMPTY_DRAFT.step,});+ return role ? backfillCategory(draft, role) : draft;} catch {return EMPTY_DRAFT;}}+// Earlier builds opened on a role question and stored the answer as `role`.+type StoredDraft = Omit<Partial<RaiseDraft>, "step"> & {+ step?: string;+ role?: string | null;+};+// A draft written before the job title beat existed has a role and no title.// Every later beat waits on the title, so the draft resumes there.function reopenedAtJobTitle(role: string): RaiseDraft {- return { ...EMPTY_DRAFT, hasStarted: true, role, step: "jobTitle" };+ return backfillCategory(+ {+ ...EMPTY_DRAFT,+ hasStarted: true,+ step: "jobTitle",+ ...(!categoryForRole(role) ? { legacyRole: role } : {}),+ },+ role,+ );}// A draft written by an earlier build recorded a skipped voice as a null@@ -157,9 +173,24 @@ function reopenedAtJobTitle(role: string): RaiseDraft {function migrateStep(step: string | undefined): string | undefined {if (step === "kit") return "budget";if (step === "color") return "avatar";+ if (step === "role") return "category";return step;}+// A draft started on the role question takes the category its role implies,+// so it never waits on an area it was not asked for. One parked on the area+// beat, which used to follow the name, moves on to the avatar.+function backfillCategory(draft: RaiseDraft, role: string): RaiseDraft {+ if (draft.category !== null) return draft;+ const category = categoryForRole(role) ?? legacyCategoryForRole(role);+ return {+ ...draft,+ category,+ color: draft.color ?? colorForCategory(category),+ step: draft.step === "category" ? "avatar" : draft.step,+ };+}+function backfillSkippedVoice(draft: RaiseDraft): RaiseDraft {if (draft.voiceLabel !== null) return draft;if (STEP_ORDER.indexOf(draft.step) <= STEP_ORDER.indexOf("voice")) {@@ -210,20 +241,21 @@ export function isEmptyDraft(draft: RaiseDraft): boolean {);}-/** `/raise?role=…` from the greeting page's raise door: answers the role- * beat exactly as `pickRole` would, so the flow opens on the job title- * question instead of asking again for something already chosen. */+/** `/raise?role=…` from the greeting page's raise door: answers the area+ * beat with the role's category exactly as `pickCategory` would, so the flow+ * opens on the job title question instead of asking again. */export function draftWithPrefilledRole(draft: RaiseDraft,role: string | null,): RaiseDraft {if (!role || !isEmptyDraft(draft)) return draft;- const preset = findRoleOption(role);- if (!preset && !isValidCustomRole(role)) return draft;+ const category = categoryForRole(role);+ if (!category) return draft;return {...draft,hasStarted: true,- role: preset ? preset.id : normalizeCustomRole(role),+ category,+ color: colorForCategory(category),step: "jobTitle",};}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/legacyCategory.ts b/autogpt_platform/frontend/src/app/(platform)/raise/legacyCategory.tsnew file mode 100644index 0000000000..274485fef8--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/raise/legacyCategory.ts@@ -0,0 +1,26 @@+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";++const TOPIC_PATTERNS: Array<[RegExp, ExpertAvatarRequestCategory]> = [+ [/finance|invoic|bookkeep|fundrais|investor/i, "finance"],+ [/research|intelligence|data|analysis/i, "research"],+ [/development|code|dependency|security|engineering|qa/i, "development"],+ [/sales|deal desk|proposal|revops|crm|partnership/i, "sales"],+ [/support|customer|help desk|retention/i, "support"],+ [+ /marketing|social|seo|brand|growth|email|lifecycle|go.to.market|paid ads|performance|communications|\bpr\b/i,+ "marketing",+ ],+ [+ /ops|operations|recruit|hiring|vendor|procurement|contracts|product|people|privacy|compliance|assistant/i,+ "operations",+ ],+ [/content|writing|editor/i, "content"],+];++export function legacyCategoryForRole(+ role: string,+): ExpertAvatarRequestCategory {+ return (+ TOPIC_PATTERNS.find(([pattern]) => pattern.test(role))?.[1] ?? "content"+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/useRaisePage.ts b/autogpt_platform/frontend/src/app/(platform)/raise/useRaisePage.tsindex 01dca755a0..1079b6242c 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/useRaisePage.ts+++ b/autogpt_platform/frontend/src/app/(platform)/raise/useRaisePage.ts@@ -1,3 +1,4 @@+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import type { VoicePickResult } from "@/components/organisms/VoicePicker/helpers";import { useSearchParams } from "next/navigation";import { useState } from "react";@@ -23,6 +24,7 @@ import {type RaiseDraft,type RaiseKit,} from "./helpers";+import { colorForCategory } from "./components/CategoryStep/helpers";import { useFlowProgress } from "./useFlowProgress";import { useRaiseSubmission } from "./useRaiseSubmission";import { useSkillsAvailability } from "./useSkillsAvailability";@@ -30,7 +32,7 @@ import { useSkillsAvailability } from "./useSkillsAvailability";export function useRaisePage() {const searchParams = useSearchParams();// Seeded in the initialiser rather than an effect: an effect would render- // the role question first and then snatch it away.+ // the area question first and then snatch it away.const [draft, setDraft] = useState<RaiseDraft>(() =>draftWithPrefilledRole(loadDraft(), searchParams.get("role")),);@@ -59,8 +61,8 @@ export function useRaisePage() {progress.reset();}- function pickRole(roleId: string) {- update({ role: roleId, step: "jobTitle" });+ function pickCategory(category: ExpertAvatarRequestCategory) {+ update({ category, color: colorForCategory(category), step: "jobTitle" });}function submitJobTitle(value: string) {@@ -79,8 +81,8 @@ export function useRaisePage() {update({ name: trimmed, step: "avatar" });}- function pickAvatar(avatarUrl: string, colorId: string) {- update({ avatarUrl, color: colorId, step: "about" });+ function pickAvatar(avatarUrl: string) {+ update({ avatarUrl, step: "about" });}function submitAbout(value: string) {@@ -167,8 +169,8 @@ export function useRaisePage() {return {step: draft.step,hasStarted: draft.hasStarted,- role: draft.role,jobTitle: draft.jobTitle,+ category: draft.category,color: draft.color,avatarUrl: draft.avatarUrl,about: draft.about,@@ -185,7 +187,7 @@ export function useRaisePage() {startRaising,restart,revealStep: (beat: BeatKey) => progress.revealStep(beat),- pickRole,+ pickCategory,submitJobTitle,skipJobTitle,submitName,diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/useRaiseSubmission.ts b/autogpt_platform/frontend/src/app/(platform)/raise/useRaiseSubmission.tsindex f1f5f0d06b..fc873f007f 100644--- a/autogpt_platform/frontend/src/app/(platform)/raise/useRaiseSubmission.ts+++ b/autogpt_platform/frontend/src/app/(platform)/raise/useRaiseSubmission.ts@@ -4,6 +4,7 @@ import { toast } from "@/components/molecules/Toast/use-toast";import { ApiError } from "@/lib/autogpt-server-api/helpers";import { useRouter } from "next/navigation";import { useRef, useState } from "react";+import { roleFor } from "./components/CategoryStep/helpers";import {failedAttachmentMessage,toRaiseAttachments,@@ -33,7 +34,7 @@ export function useRaiseSubmission() {const response = await createRaisedExpert({data: {name: draft.name,- role: draft.role,+ role: draft.legacyRole ?? roleFor(draft.category),job_title: draft.jobTitle || null,color: draft.color,avatar_url: draft.avatarUrl || null,diff --git a/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/__tests__/main.test.tsxindex ffc866f310..077057f0bf 100644--- a/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/__tests__/main.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/__tests__/main.test.tsx@@ -1087,6 +1087,19 @@ describe("ExpertDetailPage", () => {expect(body).toEqual({ avatar_url: "https://cdn.example.com/maria.png" });});+ test("the avatar dialog offers one regenerate control and no catalog", async () => {+ render(<ExpertDetailPage />);+ await userEvent.click(+ await screen.findByRole("button", { name: "Change Maria's appearance" }),+ );++ expect(+ await screen.findByRole("button", { name: "Regenerate" }),+ ).toBeDefined();+ expect(screen.queryByRole("group", { name: "Avatar catalog" })).toBeNull();+ expect(screen.queryByRole("combobox")).toBeNull();+ });+test("a failed avatar upload leaves the expert untouched", async () => {const updateSpy = vi.fn();server.use(diff --git a/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/components/ExpertAvatarButton/ExpertAvatarButton.tsx b/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/components/ExpertAvatarButton/ExpertAvatarButton.tsxindex 42e62691e7..23a36f3ed6 100644--- a/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/components/ExpertAvatarButton/ExpertAvatarButton.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/team/[expertId]/components/ExpertAvatarButton/ExpertAvatarButton.tsx@@ -2,6 +2,8 @@import { getExpertTopicHex } from "@/components/molecules/ExpertAvatar/colors";+import { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { getExpertVisualCategory } from "@/components/molecules/ExpertAvatar/helpers";import type { Expert } from "@/app/api/__generated__/models/expert";import { ExpertAvatar } from "@/components/molecules/ExpertAvatar/ExpertAvatar";import { ExpertAvatarPicker } from "@/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker";@@ -44,9 +46,17 @@ export function ExpertAvatarButton({ expert }: Props) {<fieldset disabled={isPending} className="min-w-0"><ExpertAvatarPickername={expert.name}- color={expert.color ?? null}+ category={+ Object.values(ExpertAvatarRequestCategory).find(+ (category) =>+ category ===+ getExpertVisualCategory(+ expert.avatar_url,+ expert.categories,+ ),+ ) ?? "general"+ }avatarUrl={expert.avatar_url}- categories={expert.categories}onPick={saveAvatar}/></fieldset>diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsxindex 59f31ce098..6512b2b180 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx@@ -1,12 +1,16 @@import type { Meta, StoryObj } from "@storybook/nextjs";import { delay, http, HttpResponse } from "msw";import { fn } from "storybook/test";+import {+ DEFAULT_EXPERT_AVATAR_URL,+ MANAGED_IDENTITIES,+} from "../ExpertAvatar/helpers";import { ExpertAvatarPicker } from "./ExpertAvatarPicker";const meta = {title: "Molecules/ExpertAvatarPicker",component: ExpertAvatarPicker,- args: { name: "Nova", color: null, onPick: fn() },+ args: { name: "Nova", category: "finance", onPick: fn() },decorators: [(Story) => (<div className="w-full max-w-lg">@@ -28,7 +32,7 @@ const meta = {return HttpResponse.json({id: "preview",status: "complete",- avatar_url: "/autogpt-characters/v2.1/expert-sofia/neutral/512.png",+ avatar_url: DEFAULT_EXPERT_AVATAR_URL,});}),],@@ -39,16 +43,10 @@ const meta = {export default meta;type Story = StoryObj<typeof meta>;-/** A new custom Expert: the General fallback, an upload, or a generated- * candidate in the chosen category's color. */-export const NewExpert: Story = {};+/** The raise flow: one avatar, sculpted the moment the beat opens. */+export const Generating: Story = { args: { autoGenerate: true } };-/** A hired built-in keeps its saved identity on offer beside the fallback. */-export const SavedIdentity: Story = {- args: {- name: "Maria",- avatarUrl: "/autogpt-characters/v1.1/expert-maria/neutral/128.webp",- categories: ["marketing", "content"],- color: "rose-300",- },+/** The team page: the expert already has a face until it is regenerated. */+export const ExistingAvatar: Story = {+ args: { category: "marketing", avatarUrl: MANAGED_IDENTITIES[0].url },};diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsxindex 0ba21d3810..01c485df16 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx@@ -1,18 +1,19 @@-import { render, screen, waitFor } from "@/tests/integrations/test-utils";import { server } from "@/mocks/mock-server";-import { http, HttpResponse } from "msw";+import { render, screen, waitFor } from "@/tests/integrations/test-utils";import userEvent from "@testing-library/user-event";+import { http, HttpResponse } from "msw";import { expect, test, vi } from "vitest";+import { StrictMode } from "react";import { ExpertAvatarPicker } from "./ExpertAvatarPicker";-test("generates a preview and only saves the selected PNG after confirmation", async () => {- const onPick = vi.fn();- const requests: unknown[] = [];- server.use(+import { DEFAULT_EXPERT_AVATAR_URL } from "../ExpertAvatar/helpers";++function completesAs(url: string, requests: unknown[] = []) {+ return [http.post("*/api/experts/avatars/generations", async ({ request }) => {requests.push(await request.json());return HttpResponse.json(- { id: "job-1", status: "pending", created_at: Date.now() / 1000 },+ { id: "job-1", status: "pending" },{ status: 202 },);}),@@ -20,95 +21,148 @@ test("generates a preview and only saves the selected PNG after confirmation", aHttpResponse.json({id: "job-1",status: "complete",- avatar_url: "https://cdn.test/generated.png",- created_at: Date.now() / 1000,+ avatar_url: url,}),),- );+ ];+}++test("auto-generates on mount, showing the General artwork until it lands", async () => {+ const onPick = vi.fn();+ server.use(...completesAs("https://cdn.test/generated.png"));render(<ExpertAvatarPickername="Nova"- color={null}- categories={["finance"]}+ category="finance"+ autoGenerateonPick={onPick}/>,);- expect(screen.getByRole("img", { name: /^Nova/ }).getAttribute("src")).toBe(- "/autogpt-characters/v2.1/expert-general-01/neutral/256.webp",- );- await userEvent.click(- screen.getByRole("button", { name: "Generate with AI" }),- );+ await screen.findByRole("status");+ expect(+ screen.getByRole("img", { name: "Nova, AI Expert" }).getAttribute("src"),+ ).toContain("expert-general-01");+await waitFor(() =>expect(screen.getByRole("img", { name: "Nova" }).getAttribute("src"),).toContain("generated.png"),);- expect(requests).toEqual([- {- category: "finance",- shape: "pebble",- base: "compact",- tilt: "level",- inlay: "sweep",- expression: "friendly",- },- ]);expect(onPick).not.toHaveBeenCalled();await userEvent.click(screen.getByRole("button", { name: "Use this avatar" }),);- expect(onPick).toHaveBeenCalledWith(- "https://cdn.test/generated.png",- "amber-300",+ expect(onPick).toHaveBeenCalledWith("https://cdn.test/generated.png");+});++test("StrictMode starts one automatic job and still allows regeneration", async () => {+ const requests: unknown[] = [];+ server.use(...completesAs("https://cdn.test/generated.png", requests));+ render(+ <StrictMode>+ <ExpertAvatarPicker+ name="Nova"+ category="finance"+ autoGenerate+ onPick={vi.fn()}+ />+ </StrictMode>,+ );++ await waitFor(() =>+ expect(+ screen.getByRole("img", { name: "Nova" }).getAttribute("src"),+ ).toContain("generated.png"),);+ expect(requests).toHaveLength(1);++ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));+ await waitFor(() => expect(requests).toHaveLength(2));});-test("a failed job keeps the current avatar and the catalog remains usable", async () => {+test("regenerating rolls every trait but the category", async () => {+ const requests: unknown[] = [];+ server.use(...completesAs("https://cdn.test/generated.png", requests));+ render(+ <ExpertAvatarPicker name="Nova" category="marketing" onPick={vi.fn()} />,+ );+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));+ await waitFor(() => expect(requests).toHaveLength(1));+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));+ await waitFor(() => expect(requests).toHaveLength(2));++ for (const request of requests) {+ const body = request as Record<string, string>;+ expect(body.category).toBe("marketing");+ expect(Object.keys(body).sort()).toEqual([+ "base",+ "category",+ "expression",+ "inlay",+ "shape",+ "tilt",+ ]);+ }+});++test("a failed generation leaves the General artwork ready to keep", async () => {const onPick = vi.fn();server.use(http.post("*/api/experts/avatars/generations", () =>- HttpResponse.json(- { id: "job-2", status: "pending", created_at: Date.now() / 1000 },- { status: 202 },- ),+ HttpResponse.json({ id: "job-2", status: "pending" }, { status: 202 }),),http.get("*/api/experts/avatars/generations/job-2", () =>HttpResponse.json({id: "job-2",status: "failed",error: "Could not generate avatar",- created_at: Date.now() / 1000,}),),);render(<ExpertAvatarPickername="Nova"- color="rose-300"- avatarUrl="https://cdn.test/existing.png"+ category="finance"+ autoGenerateonPick={onPick}/>,);- await userEvent.click(- screen.getByRole("button", { name: "Generate with AI" }),- );expect((await screen.findByRole("alert")).textContent).toContain("Could not generate avatar",);+ await userEvent.click(+ screen.getByRole("button", { name: "Use this avatar" }),+ );+ expect(onPick).toHaveBeenCalledWith(DEFAULT_EXPERT_AVATAR_URL);+});++test("an existing avatar is kept until a generation replaces it", async () => {+ const onPick = vi.fn();+ server.use(+ http.post("*/api/experts/avatars/generations", () =>+ HttpResponse.json(+ { detail: "Please wait before generating again." },+ { status: 429 },+ ),+ ),+ );+ render(+ <ExpertAvatarPicker+ name="Nova"+ category="finance"+ avatarUrl="https://cdn.test/existing.png"+ onPick={onPick}+ />,+ );+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));+ await screen.findByRole("alert");expect(screen.getByRole("img", { name: "Nova" }).getAttribute("src"),).toContain("existing.png");- expect(onPick).not.toHaveBeenCalled();- await userEvent.click(screen.getByRole("button", { name: "General" }));- await waitFor(() => expect(screen.queryByRole("alert")).toBeNull());await userEvent.click(screen.getByRole("button", { name: "Use this avatar" }),);- expect(onPick).toHaveBeenCalledWith(- "/autogpt-characters/v2.1/expert-general-01/neutral/128.webp",- "rose-300",- );+ expect(onPick).toHaveBeenCalledWith("https://cdn.test/existing.png");});test("uploads remain previews until chosen", async () => {@@ -118,7 +172,7 @@ test("uploads remain previews until chosen", async () => {HttpResponse.json("https://cdn.test/upload.png"),),);- render(<ExpertAvatarPicker name="Nova" color="rose-300" onPick={onPick} />);+ render(<ExpertAvatarPicker name="Nova" category="support" onPick={onPick} />);await userEvent.upload(screen.getByLabelText("Upload avatar"),new File(["png"], "avatar.png", { type: "image/png" }),@@ -132,10 +186,7 @@ test("uploads remain previews until chosen", async () => {await userEvent.click(screen.getByRole("button", { name: "Use this avatar" }),);- expect(onPick).toHaveBeenCalledWith(- "https://cdn.test/upload.png",- "rose-300",- );+ expect(onPick).toHaveBeenCalledWith("https://cdn.test/upload.png");});test("rejects oversized uploads before making a request", async () => {@@ -146,7 +197,9 @@ test("rejects oversized uploads before making a request", async () => {return HttpResponse.json("https://cdn.test/upload.png");}),);- render(<ExpertAvatarPicker name="Nova" color={null} onPick={vi.fn()} />);+ render(+ <ExpertAvatarPicker name="Nova" category="content" onPick={vi.fn()} />,+ );const file = new File(["png"], "avatar.png", { type: "image/png" });Object.defineProperty(file, "size", { value: 6 * 1024 * 1024 });await userEvent.upload(screen.getByLabelText("Upload avatar"), file);@@ -154,65 +207,6 @@ test("rejects oversized uploads before making a request", async () => {expect(upload).not.toHaveBeenCalled();});-test.each([- ["/experts/clay/v4/mina-operations.png", ["finance", "operations"]],- [- "/autogpt-characters/v1.1/expert-mina/neutral/128.webp",- ["finance", "operations"],- ],- ["https://cdn.test/custom.png", ["finance"]],-])(- "editing %s generates in the expert's own family and offers its saved identity",- async (avatarUrl, categories) => {- const requests: unknown[] = [];- server.use(- http.post("*/api/experts/avatars/generations", async ({ request }) => {- requests.push(await request.json());- return HttpResponse.json(- { detail: "Please wait before generating again." },- { status: 429 },- );- }),- );- render(- <ExpertAvatarPicker- name="Nova"- color="green-300"- avatarUrl={avatarUrl}- categories={categories}- onPick={vi.fn()}- />,- );- await userEvent.click(- screen.getByRole("button", { name: "Generate with AI" }),- );- await screen.findByRole("alert");- expect(requests).toEqual([- {- category: "finance",- shape: "pebble",- base: "compact",- tilt: "level",- inlay: "sweep",- expression: "friendly",- },- ]);- const looks = screen.getByRole("group", { name: "Managed looks" });- if (avatarUrl.startsWith("https://")) {- expect(looks.querySelectorAll("button")).toHaveLength(1);- expect(- screen.getByRole("img", { name: /^Nova/ }).getAttribute("src"),- ).toContain("custom.png");- } else {- expect(screen.getByRole("button", { name: "Mina" })).not.toBeNull();- expect(- screen.getByRole("img", { name: /^Nova/ }).getAttribute("src"),- ).toBe("/autogpt-characters/v1.1/expert-mina/neutral/256.webp");- }- expect(screen.queryByRole("button", { name: "Maria" })).toBeNull();- },-);-test("a pending generation disables uploads and confirmation", async () => {server.use(http.post("*/api/experts/avatars/generations", () =>@@ -225,9 +219,13 @@ test("a pending generation disables uploads and confirmation", async () => {HttpResponse.json({ id: "pending-job", status: "pending" }),),);- render(<ExpertAvatarPicker name="Nova" color={null} onPick={vi.fn()} />);- await userEvent.click(- screen.getByRole("button", { name: "Generate with AI" }),+ render(+ <ExpertAvatarPicker+ name="Nova"+ category="content"+ autoGenerate+ onPick={vi.fn()}+ />,);await screen.findByRole("status");expect(@@ -242,6 +240,15 @@ test("a pending generation disables uploads and confirmation", async () => {).toBe(true);});+test("offers one avatar with no catalog or trait controls", () => {+ render(+ <ExpertAvatarPicker name="Nova" category="content" onPick={vi.fn()} />,+ );+ expect(screen.queryByRole("group", { name: "Avatar catalog" })).toBeNull();+ expect(screen.queryByRole("combobox")).toBeNull();+ expect(screen.queryByRole("button", { name: "Sage" })).toBeNull();+});+vi.mock("@/lib/auth/actions", async (importOriginal) => ({...(await importOriginal<typeof import("@/lib/auth/actions")>()),getWebSocketToken: async () => ({ token: "test-token" }),diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsxindex c20f80824a..09f368e4fb 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx@@ -1,19 +1,18 @@"use client";+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";import { Button } from "@/components/atoms/Button/Button";-import { ACCEPTED_AVATAR_TYPES } from "./helpers";+import { RefreshIcon } from "@hugeicons/core-free-icons";import { ExpertAvatar } from "../ExpertAvatar/ExpertAvatar";+import { ACCEPTED_AVATAR_TYPES } from "./helpers";import { useExpertAvatarPicker } from "./useExpertAvatarPicker";-import { AvatarCatalog } from "./components/AvatarCatalog";-import { GenerationOptions } from "./components/GenerationOptions";-interface Props {name: string;- color: string | null;+ category: ExpertAvatarRequestCategory;avatarUrl?: string | null;- categories?: readonly string[] | null;- onPick: (url: string, color: string) => void;+ autoGenerate?: boolean;+ onPick: (url: string) => void;}export function ExpertAvatarPicker({ name, ...props }: Props) {@@ -24,36 +23,11 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {name={name || "Your expert"}avatarUrl={picker.selectedUrl}size={144}+ className={picker.isGenerating ? "animate-pulse" : undefined}/>- <AvatarCatalog- urls={picker.catalogUrls}- selectedUrl={picker.selectedUrl}- disabled={picker.isBusy}- onSelect={picker.selectCatalog}- />- <GenerationOptions- category={picker.category}- setCategory={picker.setCategory}- shape={picker.shape}- setShape={picker.setShape}- base={picker.base}- setBase={picker.setBase}- tilt={picker.tilt}- setTilt={picker.setTilt}- inlay={picker.inlay}- setInlay={picker.setInlay}- expression={picker.expression}- setExpression={picker.setExpression}- isBusy={picker.isBusy}- />- <p className="text-sm text-muted-foreground">- Keep a managed look, upload a picture, or generate a new clay figure in- your category's color. Up to five generations a day, four minutes- apart.- </p>{picker.isGenerating && (<p role="status" className="text-sm text-muted-foreground">- Creating your avatar. This may take a few minutes.+ Sculpting your avatar. This takes a couple of minutes.</p>)}{picker.error && (@@ -87,11 +61,12 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {<Buttonvariant="secondary"size="small"+ leadingIcon={RefreshIcon}onClick={picker.generate}loading={picker.isGenerating}disabled={picker.isBusy}>- Generate with AI+ Regenerate</Button><Button size="small" onClick={picker.confirm} disabled={picker.isBusy}>Use this avatardiff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/AvatarCatalog.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/AvatarCatalog.tsxdeleted file mode 100644index 614c2c364b..0000000000--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/AvatarCatalog.tsx+++ /dev/null@@ -1,52 +0,0 @@-import { ExpertAvatar } from "../../ExpertAvatar/ExpertAvatar";-import { getManagedIdentity } from "../../ExpertAvatar/helpers";-import { cn } from "@/lib/utils";--interface Props {- /** The managed looks this Expert may keep: its saved identity, when it has- * one, and the General fallback. Never another Expert's face. */- urls: readonly string[];- selectedUrl: string;- disabled: boolean;- onSelect: (url: string) => void;-}--export function AvatarCatalog({- urls,- selectedUrl,- disabled,- onSelect,-}: Props) {- return (- <div- role="group"- aria-label="Managed looks"- className="flex w-full flex-wrap justify-center gap-2"- >- {urls.map((url) => {- const identity = getManagedIdentity(url);- const label =- identity?.visual_category === "general"- ? "General"- : (identity?.name ?? "Saved look");- return (- <button- key={url}- type="button"- aria-label={label}- aria-pressed={selectedUrl === url}- disabled={disabled}- onClick={() => onSelect(url)}- className={cn(- "flex w-24 flex-col items-center gap-1 rounded-lg border border-border p-2 text-xs text-foreground focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50",- selectedUrl === url && "border-primary bg-muted",- )}- >- <ExpertAvatar name={label} avatarUrl={url} size={40} />- {label}- </button>- );- })}- </div>- );-}diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/GenerationOptions.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/GenerationOptions.tsxdeleted file mode 100644index bced3676ee..0000000000--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/components/GenerationOptions.tsx+++ /dev/null@@ -1,115 +0,0 @@-import { ExpertAvatarRequestBase } from "@/app/api/__generated__/models/expertAvatarRequestBase";-import { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";-import { ExpertAvatarRequestExpression } from "@/app/api/__generated__/models/expertAvatarRequestExpression";-import { ExpertAvatarRequestInlay } from "@/app/api/__generated__/models/expertAvatarRequestInlay";-import { ExpertAvatarRequestShape } from "@/app/api/__generated__/models/expertAvatarRequestShape";-import { ExpertAvatarRequestTilt } from "@/app/api/__generated__/models/expertAvatarRequestTilt";-import { Select } from "@/components/atoms/Select/Select";-import { getCategoryHex } from "../../ExpertAvatar/colors";--interface Props {- category: ExpertAvatarRequestCategory;- setCategory: (value: ExpertAvatarRequestCategory) => void;- shape: ExpertAvatarRequestShape;- setShape: (value: ExpertAvatarRequestShape) => void;- base: ExpertAvatarRequestBase;- setBase: (value: ExpertAvatarRequestBase) => void;- tilt: ExpertAvatarRequestTilt;- setTilt: (value: ExpertAvatarRequestTilt) => void;- inlay: ExpertAvatarRequestInlay;- setInlay: (value: ExpertAvatarRequestInlay) => void;- expression: ExpertAvatarRequestExpression;- setExpression: (value: ExpertAvatarRequestExpression) => void;- isBusy: boolean;-}--/** What a generated candidate may vary. The category fixes the one material- * color; the cream section always sits on the lower form; everything else- * about the material and face is locked by the design system. */-export function GenerationOptions(props: Props) {- return (- <div className="grid w-full grid-cols-2 gap-3">- <Choice- label="Category"- value={props.category}- values={Object.values(ExpertAvatarRequestCategory)}- onChange={props.setCategory}- disabled={props.isBusy}- />- <Choice- label="Head"- value={props.shape}- values={Object.values(ExpertAvatarRequestShape)}- onChange={props.setShape}- disabled={props.isBusy}- />- <Choice- label="Base"- value={props.base}- values={Object.values(ExpertAvatarRequestBase)}- onChange={props.setBase}- disabled={props.isBusy}- />- <Choice- label="Tilt"- value={props.tilt}- values={Object.values(ExpertAvatarRequestTilt)}- onChange={props.setTilt}- disabled={props.isBusy}- />- <Choice- label="Cream section"- value={props.inlay}- values={Object.values(ExpertAvatarRequestInlay)}- onChange={props.setInlay}- disabled={props.isBusy}- />- <Choice- label="Expression"- value={props.expression}- values={Object.values(ExpertAvatarRequestExpression)}- onChange={props.setExpression}- disabled={props.isBusy}- />- </div>- );-}--function Choice<T extends string>({- label,- value,- values,- onChange,- disabled,-}: {- label: string;- value: T;- values: readonly T[];- onChange: (value: T) => void;- disabled: boolean;-}) {- return (- <Select- id={`avatar-${label.toLowerCase().replaceAll(" ", "-")}`}- label={label}- value={value}- disabled={disabled}- options={values.map((value) => ({- value,- icon:- label === "Category" ? (- <span- aria-hidden- className="size-3 shrink-0 rounded-full border border-border"- style={{ backgroundColor: getCategoryHex(value) }}- />- ) : undefined,- label: value[0].toUpperCase() + value.slice(1),- }))}- onValueChange={(value) => {- const choice = values.find((choice) => choice === value);- if (choice) onChange(choice);- }}- />- );-}diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsxindex 0c10fe3275..cb6dd22634 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx@@ -1,28 +1,24 @@-import { render, screen, waitFor } from "@/tests/integrations/test-utils";import { server } from "@/mocks/mock-server";+import { render, screen, waitFor } from "@/tests/integrations/test-utils";import { http, HttpResponse } from "msw";-import userEvent from "@testing-library/user-event";import { expect, test, vi } from "vitest";import { ExpertAvatarPicker } from "./ExpertAvatarPicker";-// The hook polls on a real 2s interval, and the test drives six selects-// before it, so the default 5s budget is not enough on a loaded CI runner.+// The hook polls on a real 2s interval, so the default 5s budget is not enough+// on a loaded CI runner.const POLLING_TEST_TIMEOUT = 20000;test(- "sends the head, base, tilt, cream and expression choices, then polls until the preview is ready",+ "polls a pending job until the preview is ready",async () => {- const onPick = vi.fn();- const requests: unknown[] = [];let polls = 0;server.use(- http.post("*/api/experts/avatars/generations", async ({ request }) => {- requests.push(await request.json());- return HttpResponse.json(+ http.post("*/api/experts/avatars/generations", () =>+ HttpResponse.json({ id: "poll-job", status: "pending" },{ status: 202 },- );- }),+ ),+ ),http.get("*/api/experts/avatars/generations/poll-job", () => {polls += 1;return HttpResponse.json(@@ -31,57 +27,57 @@ test(: {id: "poll-job",status: "complete",- avatar_url: "https://cdn.test/focused.png",+ avatar_url: "https://cdn.test/sculpted.png",},);}),);- render(<ExpertAvatarPicker name="Nova" color={null} onPick={onPick} />);- await userEvent.click(screen.getByRole("combobox", { name: "Head" }));- await userEvent.click(screen.getByRole("option", { name: "Bean" }));- await userEvent.click(screen.getByRole("combobox", { name: "Category" }));- await userEvent.click(screen.getByRole("option", { name: "Finance" }));- await userEvent.click(screen.getByRole("combobox", { name: "Base" }));- await userEvent.click(screen.getByRole("option", { name: "Wide" }));- await userEvent.click(screen.getByRole("combobox", { name: "Tilt" }));- await userEvent.click(screen.getByRole("option", { name: "Left" }));- await userEvent.click(- screen.getByRole("combobox", { name: "Cream section" }),- );- await userEvent.click(screen.getByRole("option", { name: "Wrap" }));- await userEvent.click(screen.getByRole("combobox", { name: "Expression" }));- await userEvent.click(screen.getByRole("option", { name: "Focused" }));- await userEvent.click(- screen.getByRole("button", { name: "Generate with AI" }),+ render(+ <ExpertAvatarPicker+ name="Nova"+ category="development"+ autoGenerate+ onPick={vi.fn()}+ />,);+await waitFor(() => expect(polls).toBe(1));expect(screen.queryByRole("status")).not.toBeNull();- expect(requests).toEqual([- {- category: "finance",- shape: "bean",- base: "wide",- tilt: "left",- inlay: "wrap",- expression: "focused",- },- ]);await waitFor(() =>expect(screen.getByRole("img", { name: "Nova" }).getAttribute("src"),- ).toContain("focused.png"),+ ).toContain("sculpted.png"),{ timeout: 10000 },);expect(polls).toBe(2);- expect(onPick).not.toHaveBeenCalled();- await userEvent.click(- screen.getByRole("button", { name: "Use this avatar" }),- );- expect(onPick).toHaveBeenCalledWith(- "https://cdn.test/focused.png",- "amber-300",- );+ expect(screen.queryByRole("status")).toBeNull();},POLLING_TEST_TIMEOUT,);++test("offers regeneration when polling fails", async () => {+ server.use(+ http.post("*/api/experts/avatars/generations", () =>+ HttpResponse.json(+ { id: "failed-poll-job", status: "pending" },+ { status: 202 },+ ),+ ),+ http.get("*/api/experts/avatars/generations/failed-poll-job", () =>+ HttpResponse.json({}, { status: 500 }),+ ),+ );+ render(+ <ExpertAvatarPicker+ name="Nova"+ category="development"+ autoGenerate+ onPick={vi.fn()}+ />,+ );++ expect((await screen.findByRole("alert")).textContent).toBe(+ "Could not check generation. Try again or regenerate.",+ );+});diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.test.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.test.tsnew file mode 100644index 0000000000..69f1098e32--- /dev/null+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.test.ts@@ -0,0 +1,27 @@+import { ExpertAvatarRequestBase } from "@/app/api/__generated__/models/expertAvatarRequestBase";+import { ExpertAvatarRequestExpression } from "@/app/api/__generated__/models/expertAvatarRequestExpression";+import { ExpertAvatarRequestInlay } from "@/app/api/__generated__/models/expertAvatarRequestInlay";+import { ExpertAvatarRequestShape } from "@/app/api/__generated__/models/expertAvatarRequestShape";+import { ExpertAvatarRequestTilt } from "@/app/api/__generated__/models/expertAvatarRequestTilt";+import { expect, test } from "vitest";+import { randomAvatarRequest } from "./helpers";++test("every rolled trait is one the backend accepts, and the category is not rolled", () => {+ const requests = Array.from({ length: 50 }, () =>+ randomAvatarRequest("sales"),+ );++ for (const request of requests) {+ expect(request.category).toBe("sales");+ expect(Object.values(ExpertAvatarRequestShape)).toContain(request.shape);+ expect(Object.values(ExpertAvatarRequestBase)).toContain(request.base);+ expect(Object.values(ExpertAvatarRequestTilt)).toContain(request.tilt);+ expect(Object.values(ExpertAvatarRequestInlay)).toContain(request.inlay);+ expect(Object.values(ExpertAvatarRequestExpression)).toContain(+ request.expression,+ );+ }+ expect(+ new Set(requests.map((request) => request.shape)).size,+ ).toBeGreaterThan(1);+});diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.tsindex cfb6656776..b07ae826d4 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts@@ -1,2 +1,29 @@+import type { ExpertAvatarRequest } from "@/app/api/__generated__/models/expertAvatarRequest";+import { ExpertAvatarRequestBase } from "@/app/api/__generated__/models/expertAvatarRequestBase";+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { ExpertAvatarRequestExpression } from "@/app/api/__generated__/models/expertAvatarRequestExpression";+import { ExpertAvatarRequestInlay } from "@/app/api/__generated__/models/expertAvatarRequestInlay";+import { ExpertAvatarRequestShape } from "@/app/api/__generated__/models/expertAvatarRequestShape";+import { ExpertAvatarRequestTilt } from "@/app/api/__generated__/models/expertAvatarRequestTilt";+export const ACCEPTED_AVATAR_TYPES = "image/png,image/jpeg,image/webp";export const MAX_AVATAR_BYTES = 5 * 1024 * 1024;++/** Everything except the category is left to chance, so regenerating shuffles+ * the figure while the hue stays the one the category answered for. */+export function randomAvatarRequest(+ category: ExpertAvatarRequestCategory,+): ExpertAvatarRequest {+ return {+ category,+ shape: pick(Object.values(ExpertAvatarRequestShape)),+ base: pick(Object.values(ExpertAvatarRequestBase)),+ tilt: pick(Object.values(ExpertAvatarRequestTilt)),+ inlay: pick(Object.values(ExpertAvatarRequestInlay)),+ expression: pick(Object.values(ExpertAvatarRequestExpression)),+ };+}++function pick<T>(values: readonly T[]): T {+ return values[Math.floor(Math.random() * values.length)];+}diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.tsindex e3594e931e..1f29083243 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts@@ -31,7 +31,7 @@ export function useAvatarGeneration() {const error =mutation.error?.message ??(query.isError- ? "Could not check generation. Try again or choose a catalog avatar."+ ? "Could not check generation. Try again or regenerate.": job?.error);function generate(request: ExpertAvatarRequest) {diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.tsindex b8e7941e05..ee5132b7b5 100644--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts@@ -1,91 +1,56 @@-import { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";-import type { ExpertAvatarRequestBase } from "@/app/api/__generated__/models/expertAvatarRequestBase";-import type { ExpertAvatarRequestExpression } from "@/app/api/__generated__/models/expertAvatarRequestExpression";-import type { ExpertAvatarRequestInlay } from "@/app/api/__generated__/models/expertAvatarRequestInlay";-import type { ExpertAvatarRequestShape } from "@/app/api/__generated__/models/expertAvatarRequestShape";-import type { ExpertAvatarRequestTilt } from "@/app/api/__generated__/models/expertAvatarRequestTilt";+import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";+import { useMountEffect } from "@/hooks/useMountEffect";import { uploadSubmissionMediaDirect } from "@/lib/direct-upload";import { useMutation } from "@tanstack/react-query";-import { useEffect, useRef, useState } from "react";+import { useRef, useState } from "react";+import { resolveExpertAvatarUrl } from "../ExpertAvatar/helpers";import {- DEFAULT_EXPERT_AVATAR_URL,- getExpertVisualCategory,- getManagedIdentity,- resolveExpertAvatarUrl,-} from "../ExpertAvatar/helpers";-import { ACCEPTED_AVATAR_TYPES, MAX_AVATAR_BYTES } from "./helpers";+ ACCEPTED_AVATAR_TYPES,+ MAX_AVATAR_BYTES,+ randomAvatarRequest,+} from "./helpers";import { useAvatarGeneration } from "./useAvatarGeneration";interface Args {+ category: ExpertAvatarRequestCategory;avatarUrl?: string | null;- categories?: readonly string[] | null;- color: string | null;- onPick: (url: string, color: string) => void;-}--function toGenerationCategory(value: string): ExpertAvatarRequestCategory {- return (- Object.values(ExpertAvatarRequestCategory).find((c) => c === value) ??- "general"- );+ autoGenerate?: boolean;+ onPick: (url: string) => void;}export function useExpertAvatarPicker({+ category,avatarUrl,- categories,- color,+ autoGenerate,onPick,}: Args) {- const [selectedUrl, setSelectedUrl] = useState(() =>- resolveExpertAvatarUrl(avatarUrl),- );- // The saved identity, when this Expert has one, so the picker can offer it- // back after a look at the alternatives.- const savedIdentity = getManagedIdentity(avatarUrl);- const [category, setCategory] = useState<ExpertAvatarRequestCategory>(() =>- toGenerationCategory(getExpertVisualCategory(avatarUrl, categories)),- );- const [shape, setShape] = useState<ExpertAvatarRequestShape>("pebble");- const [base, setBase] = useState<ExpertAvatarRequestBase>("compact");- const [tilt, setTilt] = useState<ExpertAvatarRequestTilt>("level");- const [inlay, setInlay] = useState<ExpertAvatarRequestInlay>("sweep");- const [expression, setExpression] =- useState<ExpertAvatarRequestExpression>("friendly");+ const [uploadedUrl, setUploadedUrl] = useState<string | null>(null);const [uploadError, setUploadError] = useState<string | null>(null);const fileInputRef = useRef<HTMLInputElement>(null);- const handledJob = useRef("");const generation = useAvatarGeneration();const upload = useMutation({mutationFn: (file: File) =>uploadSubmissionMediaDirect(file, "expert-avatar"),});- const isBusy = generation.isGenerating || upload.isPending;- useEffect(() => {- const job = generation.job;- if (- job?.status !== "complete" ||- !job.id ||- !job.avatar_url ||- handledJob.current === job.id- )- return;- handledJob.current = job.id;- setSelectedUrl(job.avatar_url);- }, [generation.job]);+ // Generating resets the upload and uploading resets the generation, so the+ // two never both hold a result and the preview needs no synchronising.+ const generatedUrl =+ generation.job?.status === "complete" ? generation.job.avatar_url : null;+ const selectedUrl =+ generatedUrl ?? uploadedUrl ?? resolveExpertAvatarUrl(avatarUrl);- const catalogUrls = [- ...(savedIdentity && savedIdentity.url !== DEFAULT_EXPERT_AVATAR_URL- ? [savedIdentity.url]- : []),- DEFAULT_EXPERT_AVATAR_URL,- ];+ useMountEffect(() => {+ if (!autoGenerate) return;+ // Let StrictMode finish its cleanup before attaching a mutation observer.+ const timeout = setTimeout(generate, 0);+ return () => clearTimeout(timeout);+ });- function selectCatalog(url: string) {- if (!catalogUrls.includes(url)) return;- generation.reset();- setSelectedUrl(url);+ function generate() {+ setUploadedUrl(null);setUploadError(null);+ generation.generate(randomAvatarRequest(category));}async function uploadFile(file: File | undefined) {@@ -103,53 +68,28 @@ export function useExpertAvatarPicker({if (typeof response !== "string" || !response.trim())throw new Error("No image URL");generation.reset();- setSelectedUrl(response.trim());+ setUploadedUrl(response.trim());} catch {- setUploadError(- "Could not upload that picture. Try again or keep a managed look.",- );+ setUploadError("Could not upload that picture. Try again or regenerate.");}}function confirm() {- onPick(selectedUrl, color ?? "amber-300");- }- function generate() {- void generation.generate({- category,- shape,- base,- tilt,- inlay,- expression,- });+ onPick(selectedUrl);}+function openFilePicker() {fileInputRef.current?.click();}return {selectedUrl,- catalogUrls,- category,- setCategory,- shape,- setShape,- base,- setBase,- tilt,- setTilt,- inlay,- setInlay,- expression,- setExpression,- selectCatalog,confirm,generate,openFilePicker,fileInputRef,uploadFile,- isBusy,+ isBusy: generation.isGenerating || upload.isPending,isGenerating: generation.isGenerating,error: uploadError ?? generation.error,};