@designcrowd/library.brand-page 6.2.14 → 6.2.16

package/src/brand-page/utils/migration/migration-22.ts

@@ -745,6 +745,66 @@ const captureNoRoleTextStyles = (
   return locations;
 };
 
+type ButtonLabelRole = {
+  holder: Record<string, unknown>;
+  key: string;
+  role: string | undefined;
+};
+
+/**
+ * A button label drew its own colour, else its role's colour, else inherited
+ * `buttonStyles.style.color` — never the base coat or a container default. B moves every label to
+ * Button text whatever role it was on, so record the role each colourless label drew before B;
+ * D bakes that colour onto the label (E hasn't cleared it yet).
+ */
+const captureButtonLabelRoles = (
+  brandPageModel: BrandPageModel,
+): ButtonLabelRole[] => {
+  const labels: ButtonLabelRole[] = [];
+  const record = (
+    holder: Record<string, unknown>,
+    key: string,
+    style: RawStyleObject | undefined,
+  ): void => {
+    if (style && isBlankColorValue(style.color)) {
+      labels.push({ holder, key, role: style.textStyleType });
+    }
+  };
+
+  for (const page of brandPageModel.pages ?? []) {
+    for (const content of page.contents ?? []) {
+      const fields = content as unknown as Record<string, unknown>;
+
+      for (const key of Object.keys(
+        CONTENT_TEXT_STYLE_PROPERTY_KEYS,
+      ) as ContentTextStylePropertyKey[]) {
+        if (key === 'buttonTextStyle' || isButtonLabelField(content, key)) {
+          record(fields, key, fields[key] as RawStyleObject | undefined);
+        }
+      }
+    }
+  }
+
+  for (const header of [
+    brandPageModel.pageHeaderDesktop,
+    brandPageModel.pageHeaderMobile,
+  ]) {
+    const headerButton = header?.headerButton;
+
+    if (headerButton) {
+      record(
+        headerButton as unknown as Record<string, unknown>,
+        'buttonTextStyle',
+        (headerButton.buttonTextStyle as RawStyleObject | undefined) ?? {
+          textStyleType: TEXT_STYLE_TYPES.buttons,
+        },
+      );
+    }
+  }
+
+  return labels;
+};
+
 /**
  * An RTE-eligible field that is a plain string, not a Tiptap doc. On an old site nothing
  * converts plain text → doc (migration-20 only converts HTML), so such a field renders via
@@ -777,14 +837,16 @@ const roleColour = (
  * and the role colour (E) changes no pixels. migration-21 already baked element→frame→role
  * colour into RTE runs, so the only uncoloured runs reaching here inherit the base coat;
  * non-RTE fields (21 left them alone) resolve element→container-default→role→base coat.
- * `buttonTextStyle` and a link button's `titleStyle` are excluded — the button label takes its
- * colour from `buttonStyles`, never the base coat. A social-links section's unset icon fill is
- * frozen here too.
+ * A button label (`buttonTextStyle`, a link button's `titleStyle`, the header button, Save
+ * Contact) never takes the base coat: it bakes the colour of the role it drew before B
+ * (`captureButtonLabelRoles`), else `buttonStyles.style.color`. A social-links section's unset
+ * icon fill is frozen here too.
  */
 export const bakeElementColours = (
   brandPageModel: BrandPageModel,
   options: TextStyleOptions,
   noRoleTextStyles: NoRoleTextStyles = new WeakMap(),
+  buttonLabelRoles: ButtonLabelRole[] = [],
 ): void => {
   const baseCoat = roleColour(options, 'paragraph1');
 
@@ -916,6 +978,37 @@ export const bakeElementColours = (
     }
   }
 
+  const buttonStyleColour = brandPageModel.styles?.buttonStyles?.style?.color;
+  const bakeLabel = (
+    style: RawStyleObject | undefined,
+    roleColourValue: string | undefined,
+  ): void => {
+    const colour = !isBlankColorValue(roleColourValue)
+      ? roleColourValue
+      : buttonStyleColour;
+
+    if (style && isBlankColorValue(style.color) && !isBlankColorValue(colour)) {
+      style.color = colour;
+    }
+  };
+
+  for (const { holder, key, role } of buttonLabelRoles) {
+    bakeLabel(
+      holder[key] as RawStyleObject | undefined,
+      roleColour(options, role),
+    );
+  }
+
+  // Save Contact drew the Buttons role's colour whatever its stored style held.
+  if (brandPageModel.brandPageType === BRAND_PAGE_TYPES.brandContact) {
+    bakeLabel(
+      brandPageModel.saveContactSettings?.buttonTextStyle as
+        | RawStyleObject
+        | undefined,
+      roleColour(options, TEXT_STYLE_TYPES.buttons),
+    );
+  }
+
   // Footer copyright is non-RTE text that resolved through role → base coat, but lives
   // OUTSIDE `pages[].contents`, so freeze it here too — else it loses its colour when E
   // clears the role and F removes the base coat (the copyright-on-dark-footer regression).
@@ -1328,11 +1421,17 @@ export const migration22 = async (
     seedRoleFonts(brandPageModel, options); // A2 — count the site's fonts onto each role family
 
     const noRoleTextStyles = captureNoRoleTextStyles(brandPageModel);
+    const buttonLabelRoles = captureButtonLabelRoles(brandPageModel);
 
     reconnectContentRoles(brandPageModel, targets, options); // B — seed button styles, reconnect every text field
     stripLiftContentRte(brandPageModel, options); // C — RTE baked → override
     await convertPlainRteFields(brandPageModel, options); // B1 — plain text → Tiptap doc (after C)
-    bakeElementColours(brandPageModel, options, noRoleTextStyles); // D — freeze resolved colour
+    bakeElementColours(
+      brandPageModel,
+      options,
+      noRoleTextStyles,
+      buttonLabelRoles,
+    ); // D — freeze resolved colour
     clearRoleColours(options); // E — retire role colour
     stripRteStyleColours(brandPageModel); // G — colour-decouple RTE style objects
   }

package/src/brand-page-maker/composables/ai-chat/aiErrorCopy.ts

@@ -1,7 +1,7 @@
 // REL 1 Phase 1 / 1.5 — friendly chat copy keyed by the backend `code` field.
 //
 // Backend returns `{ error, code, message }` for known failure paths
-// (both HTTP responses and WebSocket build_error / server_error frames).
+// (both HTTP responses and WebSocket build_error frames).
 // We look up the code first, then fall back to message → error → generic.
 // English-only for now; Phase 2 promotes this to proper i18n keys.
 
@@ -50,7 +50,7 @@ export function pickErrorMessage(error: unknown): string {
  * Pick a friendly chat message from a WebSocket error frame.
  *
  * Reads `msg.{code, message, error}` directly — the shape pushed by the
- * ai-pipelines build_error / server_error WebSocket frames.
+ * ai-pipelines build_error WebSocket frames.
  */
 export function pickWsErrorMessage(
   msg: ErrorPayload | undefined | null,

package/src/brand-page-maker/composables/ai-chat/useAiWebsiteBuilderChat.ts

@@ -886,7 +886,7 @@ export function useAiWebsiteBuilderChat(): UseAiChatResult {
               return;
             }
 
-            if (msg.type === 'server_error' || msg.type === 'build_error') {
+            if (msg.type === 'build_error') {
               handleBuildError(msg);
 
               return;
@@ -999,7 +999,7 @@ export function useAiWebsiteBuilderChat(): UseAiChatResult {
           threadItems.value[messageIndex].isTyping = false;
 
           // Honour the isError flag set by error paths in callApiBuildAsync
-          // (apply-failure catch, server_error / build_error WS frames).
+          // (apply-failure catch, build_error WS frames).
           // Without this, error text would render as a normal AI reply.
           if (result.isError) {
             threadItems.value[messageIndex].isError = true;

package/src/clients/websocket-gateway-client.ts

@@ -16,17 +16,12 @@ export interface WebSocketMessage {
   type:
     | 'connected'
     | 'server_response'
-    | 'server_error'
     | 'build_error'
     | 'chat_started'
     | 'plan_announced'
     | 'item_complete';
   buildId?: string;
   connectionId?: string;
-  pageId?: string;
-  order?: number;
-  sectionType?: string;
-  mode?: string;
   toolCalls?: unknown[];
   message?: string;
   error?: string;

package/src/metadata-builder/builders/section-field-maps.ts

@@ -2,7 +2,7 @@
  * Maps AI tool call argument names → BrandPageModel content field names
  * per section type.
  *
- * Reference: service.ai-pipelines/src/agents/website/section_schemas.py
+ * Reference: service.ai-pipelines/src/agents/websiteV2/platform/tool_schemas/
  * Reference: library.brand-page/src/brand-page/models/index.ts
  */
 

package/src/metadata-builder/builders/undo-builder.ts

@@ -43,10 +43,10 @@ export interface UndoPayload {
  * can observe that an undo was executed (useful for telemetry, UI messaging,
  * and audit logs).
  *
- * Contract guarantee from the AI pipeline (Website Planner WL9): the `undo`
+ * Contract guarantee from the AI pipeline (WebsiteV2 main agent): the `undo`
  * tool call is exclusive — it never co-occurs with build/update/delete tool
  * calls in the same response. If that contract is ever violated upstream,
- * fix the planner — do not add defensive ordering here. The sequential
+ * fix the agent — do not add defensive ordering here. The sequential
  * MetadataExecutor will apply any subsequent builders on top of the restored
  * snapshot, which is the semantically correct "undo-then-apply" ordering.
  */

package/src/metadata-builder/parsers/section-tool-arguments.ts

@@ -1,7 +1,7 @@
 /**
  * Typed interfaces for website builder section tool arguments.
  *
- * Canonical reference: service.ai-pipelines/src/agents/website/section_schemas.py
+ * Canonical reference: service.ai-pipelines/src/agents/websiteV2/platform/tool_schemas/
  * Every field defined there has a corresponding TS field here.
  */
 
@@ -25,7 +25,7 @@ type UnsupportedContentType =
 export type SectionType = Exclude<ContentType, UnsupportedContentType>;
 
 // ---------------------------------------------------------------------------
-// Shared style type (matches TEXT_STYLE_SCHEMA in section_schemas.py)
+// Shared style type (matches TEXT_STYLE_SCHEMA in websiteV2/platform/tools/section_types_tool.py)
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
@@ -91,7 +91,7 @@ export const isTiptapDocument = (value: unknown): value is TiptapDocument =>
   Array.isArray((value as TiptapDocument).content);
 
 // ---------------------------------------------------------------------------
-// Shared style type (matches TEXT_STYLE_SCHEMA in section_schemas.py)
+// Shared style type (matches TEXT_STYLE_SCHEMA in websiteV2/platform/tools/section_types_tool.py)
 // ---------------------------------------------------------------------------
 
 export interface TextStyleArguments {
@@ -127,7 +127,7 @@ export interface TextStyleArguments {
  * the APPLICATION is per-section: every section's tool call writes the
  * same site-decided hex into this field.
  *
- * See `ai-pipelines/src/agents/website/tools/section_types_tool.py`
+ * See `ai-pipelines/src/agents/websiteV2/platform/tools/section_types_tool.py`
  * (`_button_text_style_field`) for the AI-side mirror.
  */
 export interface ButtonTextStyleArguments {