@oxy.so/bloom 7.1.4 → 7.2.0

package/src/agent-avatar/config-character.ts

@@ -1,25 +1,14 @@
 /** Catalog parts extend the existing avatar recipe without discarding its shape or expression fields. */
-export type AvatarCharacterCategory =
-  'shape' | 'color' | 'eyes' | 'eyewear' | 'accessory';
+export type AvatarCharacterCategory = 'shape' | 'color' | 'eyes' | 'eyewear' | 'accessory';
 
 export type AvatarCharacterConfig = {
-  /** Named catalog preset, including Clippo (`clippo`), or a saved renderer ID. */
   preset: string;
-  /** Clippo's open wire body and ring eyes are independently selectable with ID `clippo`. */
   selections?: Partial<Record<AvatarCharacterCategory, string>>;
   /** Custom body RGB accepted by the original renderer, stored as lowercase #RRGGBB. */
   bodyColor?: string;
-  /** @deprecated Retained when reading saved recipes; ignored by the renderer. Each shape owns its eye layout. */
-  eyeSpacing?: number;
 };
 
-const categories: readonly AvatarCharacterCategory[] = [
-  'shape',
-  'color',
-  'eyes',
-  'eyewear',
-  'accessory',
-];
+const categories: readonly AvatarCharacterCategory[] = ['shape', 'color', 'eyes', 'eyewear', 'accessory'];
 const validId = (value: unknown): value is string =>
   typeof value === 'string' && value.length > 0 && value.length <= 63;
 
@@ -30,44 +19,22 @@ export function parseCharacterConfig(value: unknown): AvatarCharacterConfig {
   const candidate = value as Record<string, unknown>;
   if (!validId(candidate.preset)) throw new Error('Invalid character preset.');
   const result: AvatarCharacterConfig = { preset: candidate.preset };
-  if (candidate.eyeSpacing !== undefined) {
-    if (
-      typeof candidate.eyeSpacing !== 'number' ||
-      !Number.isFinite(candidate.eyeSpacing) ||
-      candidate.eyeSpacing < 0.5 ||
-      candidate.eyeSpacing > 1.5
-    )
-      throw new Error('Invalid character eye spacing.');
-    result.eyeSpacing = candidate.eyeSpacing;
-  }
   if (candidate.bodyColor !== undefined) {
-    if (
-      typeof candidate.bodyColor !== 'string' ||
-      candidate.bodyColor.length !== 7 ||
-      !/^#[0-9a-f]{6}$/i.test(candidate.bodyColor)
-    )
+    if (typeof candidate.bodyColor !== 'string' || candidate.bodyColor.length !== 7 || !/^#[0-9a-f]{6}$/i.test(candidate.bodyColor))
       throw new Error('Invalid character body color.');
     result.bodyColor = candidate.bodyColor.toLowerCase();
   }
   if (candidate.selections !== undefined) {
-    if (
-      !candidate.selections ||
-      typeof candidate.selections !== 'object' ||
-      Array.isArray(candidate.selections)
-    )
+    if (!candidate.selections || typeof candidate.selections !== 'object' || Array.isArray(candidate.selections))
       throw new Error('Invalid character selections.');
     const selections: NonNullable<AvatarCharacterConfig['selections']> = {};
     for (const [category, id] of Object.entries(candidate.selections)) {
-      if (
-        !categories.includes(category as AvatarCharacterCategory) ||
-        !validId(id)
-      )
+      if (!categories.includes(category as AvatarCharacterCategory) || !validId(id))
         throw new Error('Invalid character selection.');
       selections[category as AvatarCharacterCategory] = id;
     }
     result.selections = selections;
   }
-  if ('state' in candidate)
-    throw new Error('Opaque character state is not supported.');
+  if ('state' in candidate) throw new Error('Opaque character state is not supported.');
   return result;
 }

package/src/agent-avatar/legacy-recipe.ts

@@ -1,8 +1,3 @@
-import { CHARACTER_COLORS } from './character-colors';
-import {
-  characterShapeGeometry,
-  isMigratedCharacterShape,
-} from './character-shapes';
 import { avatarHex } from './avatar-color';
 import { legacyContours } from './legacy-contours';
 import type { AvatarConfig } from './model';
@@ -14,7 +9,6 @@ export type LegacyRecipe = {
   points?: Point[];
   shape?: string;
   eyes: string;
-  eyeSpacing?: number;
   selections?: Pick<
     NonNullable<AvatarCharacterConfig['selections']>,
     'eyewear' | 'accessory'
@@ -24,8 +18,6 @@ export type LegacyRecipe = {
 
 /** Saved unsupported artwork stays readable without pretending it was migrated. */
 export function legacyRecipeUnsupported(config: AvatarConfig): boolean {
-  if (isMigratedCharacterShape(config.character?.selections?.shape))
-    return false;
   return (
     config.family === 'alien' || config.family === 'mascot' || !config.face
   );
@@ -82,8 +74,6 @@ export function radialContour(polygons: Point[][], samples = 256): Point[] {
 
 /** Shared capability identity for the editor and the legacy engine adapter. */
 export function legacyCharacterRecipe(config: AvatarConfig) {
-  if (config.character && config.character.preset !== 'bloom')
-    return config.character;
   const customization =
     config.character?.preset === 'bloom' ? config.character : undefined;
   return {
@@ -98,15 +88,7 @@ export function legacyCharacterRecipe(config: AvatarConfig) {
         ? { accessory: customization.selections.accessory }
         : {}),
     },
-    bodyColor:
-      customization?.bodyColor ??
-      CHARACTER_COLORS[
-        customization?.selections?.color as keyof typeof CHARACTER_COLORS
-      ] ??
-      avatarHex(config),
-    ...(customization?.eyeSpacing !== undefined
-      ? { eyeSpacing: customization.eyeSpacing }
-      : {}),
+    bodyColor: customization?.bodyColor ?? avatarHex(config),
   };
 }
 
@@ -120,24 +102,14 @@ export function legacyRecipe(
 ): LegacyRecipe {
   if (legacyRecipeUnsupported(config))
     throw new Error('Unsupported legacy 3D recipe');
-  const geometry = characterShapeGeometry(config);
-  const canonical = config.character && config.character.preset !== 'bloom';
-  const selectedShape = canonical
-    ? config.character?.selections?.shape
-    : undefined;
-  const shape = isMigratedCharacterShape(selectedShape)
-    ? undefined
-    : (selectedShape ?? legacyNativeShape(geometry));
+  const shape = legacyNativeShape(config);
   const recipe = legacyCharacterRecipe(config);
-  const { eyewear, accessory } = recipe.selections ?? {};
+  const { eyewear, accessory } = recipe.selections;
   return {
     ...(shape
       ? { shape }
-      : { points: radialContour(legacyContours(geometry), samples) }),
-    eyes: recipe.selections?.eyes ?? 'oval',
-    ...(recipe.eyeSpacing !== undefined
-      ? { eyeSpacing: recipe.eyeSpacing }
-      : {}),
+      : { points: radialContour(legacyContours(config), samples) }),
+    eyes: recipe.selections.eyes,
     ...(eyewear || accessory
       ? {
           selections: {
@@ -146,6 +118,6 @@ export function legacyRecipe(
           },
         }
       : {}),
-    patch: { bodyColor: recipe.bodyColor ?? avatarHex(config) },
+    patch: { bodyColor: recipe.bodyColor },
   };
 }

package/src/agent-creator/AgentCreatorBase.tsx

@@ -1,19 +1,15 @@
-import { useContext, useMemo, useRef, useState } from 'react';
+import { useContext, useMemo, useState } from 'react';
 import { Platform } from 'react-native';
 import { AgentAvatar, type AvatarConfig } from '../agent-avatar';
-import {
-  CHARACTER_SHAPES,
-  NATIVE_CHARACTER_SHAPES,
-  createConfigForShape,
-  currentCharacterShape,
-  materializeCharacter,
-} from '../agent-avatar/character-shapes';
 import type { AvatarCharacterCategory } from '../agent-avatar/config-character';
 import {
   CharacterRuntimeContext,
   CharacterCapabilitiesContext,
 } from '../agent-avatar/context';
-import { legacyCharacterRecipe } from '../agent-avatar/legacy-recipe';
+import {
+  legacyCharacterRecipe,
+  legacyNativeShape,
+} from '../agent-avatar/legacy-recipe';
 import { Button } from '../button/Button';
 import { CloseButton } from '../button/CloseButton';
 import { useDirectionProps } from '../hooks/use-is-rtl';
@@ -60,86 +56,58 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
   );
   const { runtimeUrl } = runtime;
   const beta = Boolean(c.character && c.character.preset !== 'bloom');
+  const nativeShape = legacyNativeShape(c);
   const key = JSON.stringify(beta ? c.character : legacyCharacterRecipe(c));
-  const currentCapabilities =
+  const capabilities =
     catalog.capabilitiesByKey?.get(key) ??
     (catalog.capabilities?.key === key ? catalog.capabilities : undefined);
-  const retained = useRef<{ owner: string; selected: Record<string, string> }>({
-    owner: '',
-    selected: {},
-  });
-  const owner = JSON.stringify([agent.id, c.character?.preset ?? 'bloom']);
-  if (retained.current.owner !== owner)
-    retained.current = { owner, selected: {} };
-  if (currentCapabilities)
-    retained.current.selected = currentCapabilities.selected;
-  const capabilities = currentCapabilities ?? {
-    selected: retained.current.selected,
-    available: {},
-  };
   const betaColor =
-    c.character?.selections?.color ?? capabilities?.selected.color;
-  const betaBodyColor =
-    c.character?.bodyColor ??
-    (c.character?.preset === 'clippo' && !c.character.selections?.color
-      ? '#999b9d'
-      : undefined) ??
-    (!betaColor ? capabilities?.selected.bodyColor : undefined);
+    capabilities?.selected.color ?? c.character?.selections?.color;
   const customColorValue = beta
-    ? (betaBodyColor ??
-      (c.character?.selections?.color
-        ? CHARACTER_COLORS[
-            c.character.selections.color as keyof typeof CHARACTER_COLORS
-          ]
-        : undefined) ??
-      capabilities?.selected.bodyColor ??
+    ? (c.character?.bodyColor ??
       CHARACTER_COLORS[betaColor as keyof typeof CHARACTER_COLORS] ??
       avatarHex(c))
-    : (c.character?.bodyColor ??
-      CHARACTER_COLORS[
-        c.character?.selections?.color as keyof typeof CHARACTER_COLORS
-      ] ??
-      avatarHex(c));
+    : (c.character?.bodyColor ?? avatarHex(c));
   const selectedEyes =
-    c.character?.selections?.eyes ??
-    capabilities?.selected.eyes ??
-    (c.character?.preset === 'clippo'
-      ? 'clippo'
-      : c.character?.preset === 'lime_frog'
-        ? 'todd'
-        : 'oval');
-  const selectedEyewear =
-    c.character?.selections?.eyewear ?? capabilities?.selected.eyewear;
-  const selectedAccessory =
-    c.character?.selections?.accessory ?? capabilities?.selected.accessory;
-  const selectedParts = {
-    ...(c.character?.selections?.eyes ||
-    capabilities.selected.eyes ||
-    c.character?.preset === 'clippo' ||
-    c.character?.preset === 'lime_frog'
-      ? { eyes: selectedEyes }
-      : {}),
-    ...(selectedEyewear ? { eyewear: selectedEyewear } : {}),
-    ...(selectedAccessory ? { accessory: selectedAccessory } : {}),
-  };
+    capabilities?.selected.eyes ?? c.character?.selections?.eyes ?? 'oval';
   const characterConfig = (
     category: AvatarCharacterCategory,
     id: string,
   ): AvatarConfig => {
-    if (category === 'shape')
-      return createConfigForShape(c, id, capabilities.selected);
-    const character = materializeCharacter(c, capabilities.selected);
-    // Choosing a body retains the edited face and the preset's effective parts.
-    // Presets supply defaults; their catalog restrictions do not own edits.
-    const selections = {
-      ...selectedParts,
-      ...character.selections,
-      [category]: id,
-    };
-    const next = {
-      ...character,
-      selections,
-    };
+    if (
+      !beta &&
+      (category === 'eyes' ||
+        category === 'eyewear' ||
+        category === 'accessory')
+    )
+      return {
+        ...c,
+        character: {
+          ...c.character,
+          preset: 'bloom',
+          selections: { ...c.character?.selections, [category]: id },
+        },
+      };
+    const character = beta
+      ? c.character!
+      : {
+          preset: 'blue_beret',
+          bodyColor: customColorValue,
+          selections: {
+            eyewear:
+              c.character?.selections?.eyewear ??
+              capabilities?.selected.eyewear ??
+              'none',
+            accessory:
+              c.character?.selections?.accessory ??
+              capabilities?.selected.accessory ??
+              'none',
+            eyes: selectedEyes,
+          },
+        };
+    const selections = { ...character.selections, [category]: id };
+    if (category === 'shape') delete selections.eyes;
+    const next = { ...character, selections };
     if (category === 'color') delete next.bodyColor;
     return { ...c, character: next };
   };
@@ -149,37 +117,103 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
     ? runtimeUrl.slice(0, runtimeUrl.lastIndexOf('/') + 1)
     : '';
   const eyeBackground = customColorValue;
+  const migratedShapes = [
+    ...(['slender', 'pocket', 'petal', 'star', 'cloud', 'shield'] as const).map(
+      (shape) => ({
+        family: 'fold' as const,
+        shape,
+        title: messages.shapes[shape],
+      }),
+    ),
+    ...(
+      [
+        ['pebble', 'Pebble'],
+        ['squircle', 'Squircle'],
+      ] as const
+    ).map(([shape, title]) => ({
+      family: 'blob' as const,
+      shape,
+      title: messages.characterOption('shape', shape, title),
+    })),
+  ];
+  const migratedConfig = (
+    family: 'fold' | 'blob',
+    shape: string,
+  ): AvatarConfig => {
+    const { character: _character, ...existing } = c;
+    const color = hexAppearance(customColorValue);
+    return {
+      ...existing,
+      ...color,
+      lightEyes: beta ? false : c.lightEyes,
+      family,
+      ...(family === 'fold'
+        ? { foldShape: shape as AvatarConfig['foldShape'] }
+        : { shape: shape as AvatarConfig['shape'] }),
+      ...(runtimeUrl
+        ? {
+            character: {
+              preset: 'bloom',
+              selections: {
+                eyes: selectedEyes,
+                ...((capabilities?.selected.eyewear ??
+                c.character?.selections?.eyewear)
+                  ? {
+                      eyewear:
+                        capabilities?.selected.eyewear ??
+                        c.character?.selections?.eyewear,
+                    }
+                  : {}),
+                ...((capabilities?.selected.accessory ??
+                c.character?.selections?.accessory)
+                  ? {
+                      accessory:
+                        capabilities?.selected.accessory ??
+                        c.character?.selections?.accessory,
+                    }
+                  : {}),
+              },
+            },
+          }
+        : {}),
+    };
+  };
   const shapeChoices = runtimeUrl
-    ? CHARACTER_SHAPES.map(([id, title]) => ({
-        id,
-        label:
-          id in messages.shapes
-            ? messages.shapes[id as keyof typeof messages.shapes]
-            : messages.characterOption('shape', id, title),
-        config: createConfigForShape(c, id, capabilities.selected),
-        ...(NATIVE_CHARACTER_SHAPES.some(([shape]) => shape === id) &&
-        id !== 'clippo' &&
-        id !== 'todd'
-          ? { thumbnail: `${thumbnailBase}thumbnails/shapes/${id}.png` }
-          : {}),
-      }))
+    ? [
+        ...CHARACTER_OPTIONS.shape.map(([id, title]) => ({
+          id,
+          label: messages.characterOption('shape', id, title),
+          config: characterConfig('shape', id),
+          thumbnail: `${thumbnailBase}thumbnails/shapes/${id}.png`,
+        })),
+        ...migratedShapes.map(({ family, shape, title }) => ({
+          id: `legacy:${family}:${shape}`,
+          label: title,
+          config: migratedConfig(family, shape),
+        })),
+      ]
     : undefined;
-  const shapeValue =
-    c.character?.selections?.shape ??
-    (beta
-      ? (capabilities.selected.shape ??
-        (c.character?.preset === 'clippo' ? 'clippo' : undefined))
-      : currentCharacterShape(c));
-  const selectShape = (id: string) => selectCharacter('shape', id);
+  const shapeValue = beta
+    ? (capabilities?.selected.shape ?? c.character?.selections?.shape)
+    : (nativeShape ??
+      `legacy:${c.family}:${c.family === 'fold' ? c.foldShape : c.shape}`);
+  const selectShape = (id: string) => {
+    if (id.startsWith('legacy:')) {
+      const [, family, shape] = id.split(':');
+      onChange({
+        ...agent,
+        avatar: migratedConfig(family as 'fold' | 'blob', shape!),
+      });
+    } else selectCharacter('shape', id);
+  };
   const eyeChoices = runtimeUrl
     ? CHARACTER_OPTIONS.eyes.map(([id, title]) => ({
         id,
         label: messages.characterOption('eyes', id, title),
         config: characterConfig('eyes', id),
-        ...(id === 'clippo' || id === 'cyclops'
-          ? { artwork: id }
-          : { thumbnail: `${thumbnailBase}thumbnails/eyes/${id}.png` }),
-        disabled: false,
+        thumbnail: `${thumbnailBase}thumbnails/eyes/${id}.png`,
+        disabled:
+          !capabilities || capabilities.available[`eyes:${id}`] === false,
       }))
     : undefined;
   const appearance = (patch: Partial<AvatarConfig>) => {
@@ -333,15 +367,8 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
             </StyledView>
           )}
           <CharacterControls
-            character={
-              runtimeUrl
-                ? beta
-                  ? c.character
-                  : materializeCharacter(c, capabilities.selected)
-                : c.character
-            }
+            character={c.character ?? { preset: 'bloom' }}
             capabilitiesKey={key}
-            selected={capabilities.selected}
             onChange={(character) => {
               if (character)
                 onChange({ ...agent, avatar: { ...c, character } });
@@ -359,7 +386,7 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
                 boxShadow: '0 1px 2px rgba(0,0,0,.05)',
               }}
             >
-              {!runtimeUrl &&
+              {!beta &&
                 AVATAR_COLORS.map(([hue, saturation, name, center, edge]) => {
                   const active =
                     c.hue === hue &&
@@ -388,11 +415,15 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
                     </StyledPressable>
                   );
                 })}
-              {runtimeUrl &&
+              {beta &&
                 CHARACTER_OPTIONS.color.map(([id, title]) => {
-                  const active = !betaBodyColor && betaColor === id;
+                  const active =
+                    !c.character?.bodyColor &&
+                    capabilities?.selected.color === id;
                   const hex = CHARACTER_COLORS[id];
-                  const disabled = false;
+                  const disabled =
+                    !capabilities ||
+                    capabilities.available[`color:${id}`] === false;
                   return (
                     <StyledPressable
                       key={id}
@@ -415,18 +446,18 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
                 <PopoverTrigger asChild label={messages.customColor}>
                   <StyledPressable
                     aria-pressed={
-                      runtimeUrl ? Boolean(betaBodyColor) : undefined
+                      beta ? Boolean(c.character?.bodyColor) : undefined
                     }
                     accessibilityState={{
-                      selected: Boolean(runtimeUrl) && Boolean(betaBodyColor),
+                      selected: beta && Boolean(c.character?.bodyColor),
                     }}
                     className="relative size-[26px] shrink-0 overflow-hidden rounded-full"
                   >
                     <GlossArt
-                      rainbow={!runtimeUrl || !betaBodyColor}
-                      center={runtimeUrl ? betaBodyColor : undefined}
-                      edge={runtimeUrl ? betaBodyColor : undefined}
-                      active={Boolean(runtimeUrl) && Boolean(betaBodyColor)}
+                      rainbow={!beta || !c.character?.bodyColor}
+                      center={beta ? c.character?.bodyColor : undefined}
+                      edge={beta ? c.character?.bodyColor : undefined}
+                      active={beta && Boolean(c.character?.bodyColor)}
                     />
                   </StyledPressable>
                 </PopoverTrigger>
@@ -442,14 +473,14 @@ export function AgentCreatorBase(props: AgentCreatorProps) {
                     onChange={(hex) => {
                       const next = hexAppearance(hex);
                       if (!next) return;
-                      if (runtimeUrl)
+                      if (beta)
                         onChange({
                           ...agent,
                           avatar: {
                             ...c,
                             ...next,
                             character: {
-                              ...materializeCharacter(c, capabilities.selected),
+                              ...c.character!,
                               bodyColor: hex.toLowerCase(),
                             },
                           },

package/src/agent-creator/CharacterControls.tsx

@@ -1,4 +1,4 @@
-import { useContext, useRef } from 'react';
+import { useContext } from 'react';
 import {
   CharacterRuntimeContext,
   CharacterCapabilitiesContext,
@@ -16,12 +16,10 @@ import { useAgentCreatorBindings, useAgentCreatorMessages } from './context';
 export function CharacterControls({
   character,
   capabilitiesKey,
-  selected,
   onChange,
 }: {
   character?: AvatarCharacterConfig;
   capabilitiesKey?: string;
-  selected?: Readonly<Record<string, string>>;
   onChange: (character: AvatarCharacterConfig | undefined) => void;
 }) {
   const messages = useAgentCreatorMessages();
@@ -38,21 +36,11 @@ export function CharacterControls({
     SelectItem,
     SelectItemText,
   } = useAgentCreatorBindings();
+  if (!runtimeUrl) return null;
   const key = capabilitiesKey ?? JSON.stringify(character);
-  const current =
+  const resolved =
     capabilitiesByKey?.get(key) ??
     (character && capabilities?.key === key ? capabilities : undefined);
-  const retained = useRef<{
-    preset?: string;
-    selected: Readonly<Record<string, string>>;
-  }>({ selected: {} });
-  if (retained.current.preset !== character?.preset)
-    retained.current = { preset: character?.preset, selected: {} };
-  if (current) retained.current.selected = current.selected;
-  const resolved = {
-    selected: selected ?? current?.selected ?? retained.current.selected,
-  };
-  if (!runtimeUrl) return null;
   const row = (
     label: string,
     value: string,
@@ -102,14 +90,11 @@ export function CharacterControls({
   if (character && !presets.some((item) => item.id === character.preset))
     presets.push({
       id: character.preset,
-      title:
-        character.preset === 'legacy'
-          ? messages.proceduralAvatar
-          : messages.characterOption(
-              'preset',
-              character.preset,
-              character.preset,
-            ),
+      title: messages.characterOption(
+        'preset',
+        character.preset,
+        character.preset,
+      ),
     });
   const labels: Record<AvatarCharacterCategory, string> = {
     shape: messages.shape,
@@ -135,8 +120,8 @@ export function CharacterControls({
           (category) =>
             row(
               labels[category],
-              character.selections?.[category] ??
-                resolved?.selected[category] ??
+              resolved?.selected[category] ??
+                character.selections?.[category] ??
                 'none',
               (category === 'accessory'
                 ? [
@@ -147,24 +132,14 @@ export function CharacterControls({
               ).map(([id, title]) => ({
                 id,
                 title: messages.characterOption(category, id, title),
-                disabled: false,
+                disabled:
+                  !resolved ||
+                  resolved.available[`${category}:${id}`] === false,
               })),
               (id) => {
                 onChange({
                   ...character,
-                  selections: {
-                    ...(['eyes', 'eyewear', 'accessory'] as const).reduce(
-                      (parts, part) => ({
-                        ...parts,
-                        ...(resolved?.selected[part]
-                          ? { [part]: resolved.selected[part] }
-                          : {}),
-                      }),
-                      {},
-                    ),
-                    ...character.selections,
-                    [category]: id,
-                  },
+                  selections: { ...character.selections, [category]: id },
                 });
               },
               labels[category],