@wix/himalaya-cli 0.1028.0 → 0.1029.0

package/dist/cli.mjs

@@ -5351,6 +5351,7 @@ function walk(node, registry, path2, out) {
 var SYSTEM_FONT_FAMILY, TONAL_ELEVATION_ALPHA;
 var init_tokens = __esm({
   "../../core/ts/src/tokens.ts"() {
+    "use strict";
     SYSTEM_FONT_FAMILY = "$system";
     TONAL_ELEVATION_ALPHA = [0, 0.05, 0.08, 0.11, 0.12, 0.14];
   }
@@ -5377,6 +5378,7 @@ function resolveTranslation(value, catalog, sourceCatalog) {
 var BINDING_SIGILS, BINDING_SIGIL_RE, TRANSLATION_PREFIX, TRANSLATION_KEY_RE;
 var init_bindings = __esm({
   "../../core/ts/src/bindings.ts"() {
+    "use strict";
     BINDING_SIGILS = ["service", "flag", "item", "t"];
     BINDING_SIGIL_RE = new RegExp(
       `^\\$(?:${BINDING_SIGILS.filter((s) => s !== "t").join("|")})\\b|^\\$t:`
@@ -22588,19 +22590,24 @@ function currentOrigin() {
   }
 }
 function webviewFrameSandbox(url, grants2 = [], pageOrigin = currentOrigin()) {
+  const target = classifyEmbedUrl(url, pageOrigin);
+  if (!target || !NETWORK_SCHEMES.has(target.protocol)) return null;
+  const tokens = ["allow-scripts", ...grants2.filter((g) => g !== "allow-scripts" && g !== "allow-same-origin")];
+  if (target.crossOrigin) tokens.splice(1, 0, "allow-same-origin");
+  return { src: target.crossOrigin ? target.href : url, sandbox: tokens.join(" ") };
+}
+function classifyEmbedUrl(url, pageOrigin = currentOrigin()) {
   const parsed = url.replace(/^[\u0000-\u0020]+|[\u0000-\u0020]+$/g, "").replace(/[\t\n\r]/g, "");
   const absolute = /^[a-z][a-z0-9+.-]*:/i.test(parsed);
+  const schemeRelative = !absolute && /^[\\/]{2}/.test(parsed);
   let target;
   try {
     target = new URL(parsed, pageOrigin ?? "http://relative.invalid");
   } catch {
     return null;
   }
-  if (!NETWORK_SCHEMES.has(target.protocol)) return null;
-  const crossOrigin = pageOrigin !== null && absolute && target.origin !== pageOrigin;
-  const tokens = ["allow-scripts", ...grants2.filter((g) => g !== "allow-scripts" && g !== "allow-same-origin")];
-  if (crossOrigin) tokens.splice(1, 0, "allow-same-origin");
-  return { src: crossOrigin ? target.href : url, sandbox: tokens.join(" ") };
+  const crossOrigin = pageOrigin !== null && target.origin !== pageOrigin;
+  return { protocol: target.protocol, href: target.href, absolute, schemeRelative, crossOrigin };
 }
 function isWebviewUrlAllowed(url) {
   return webviewFrameSandbox(url, [], null) !== null;
@@ -22612,6 +22619,36 @@ var init_webviewFrame = __esm({
   }
 });
 
+// ../../core/web-renderer/src/pdfSource.ts
+function pdfEmbedPlan(url, pageOrigin = currentOrigin()) {
+  const target = classifyEmbedUrl(url, pageOrigin);
+  if (!target) return null;
+  if (target.protocol === "http:" || target.protocol === "https:") {
+    if (pageOrigin === null) {
+      if (target.absolute) return { mode: "direct", src: target.href };
+      if (target.schemeRelative) return { mode: "direct", src: target.href.replace(/^https?:/, "") };
+      return null;
+    }
+    return { mode: target.crossOrigin ? "direct" : "retype", src: target.href };
+  }
+  if (target.protocol === "blob:" && pageOrigin !== null && !target.crossOrigin) {
+    return { mode: "retype", src: target.href };
+  }
+  return null;
+}
+async function retypeAsPdf(src, fetchImpl = fetch) {
+  const res = await fetchImpl(src, { credentials: "same-origin" });
+  if (!res.ok) return null;
+  if (/html|xml/i.test(res.headers.get("content-type") ?? "")) return null;
+  const body = await res.blob();
+  return URL.createObjectURL(body.slice(0, body.size, "application/pdf"));
+}
+var init_pdfSource = __esm({
+  "../../core/web-renderer/src/pdfSource.ts"() {
+    init_webviewFrame();
+  }
+});
+
 // ../../core/web-renderer/src/a11y/controls.tsx
 import React3 from "react";
 import { jsx as jsx4, jsxs } from "react/jsx-runtime";
@@ -24314,6 +24351,14 @@ function useResolvedMediaItems(items, ctx) {
     return out ?? it;
   }), [items, values, ctx]);
 }
+function sourceFragment(src) {
+  if (!src) return "";
+  try {
+    return new URL(src).hash;
+  } catch {
+    return "";
+  }
+}
 function isNativeInteractiveElement(el) {
   const props = el.props;
   return typeof el.type === "string" && (["button", "input", "select", "textarea"].includes(el.type) || el.type === "a" && typeof props.href === "string");
@@ -25877,6 +25922,7 @@ var init_renderNode = __esm({
     init_actionParams();
     init_icons();
     init_webviewFrame();
+    init_pdfSource();
     init_icon_catalog_generated();
     init_controls();
     init_modalStack();
@@ -27054,8 +27100,32 @@ var init_renderNode = __esm({
     PdfViewNode = withExtras("PdfViewNode", ({ props, ctx, wrap }) => {
       const boundUrl = useResolvedScalar(props.url != null && isBinding(props.url) ? props.url : void 0, ctx);
       const url = props.url != null && isBinding(props.url) ? boundUrl : props.url;
-      const rawUrl = typeof url === "string" && !isBinding(url) ? url.trim() : "";
-      const ok = /^(https?:|blob:|\/)/i.test(rawUrl);
+      const rawUrl = typeof url === "string" && !isBinding(url) ? url : "";
+      const plan = rawUrl ? pdfEmbedPlan(rawUrl) : null;
+      const retypeSrc = plan?.mode === "retype" ? plan.src : null;
+      const [retyped, setRetyped] = React5.useState(null);
+      React5.useEffect(() => {
+        if (!retypeSrc) return;
+        let live2 = true;
+        let made = null;
+        const settle = (u) => {
+          made = u;
+          if (!live2) {
+            if (u) URL.revokeObjectURL(u);
+            return;
+          }
+          setRetyped({ from: retypeSrc, url: u });
+        };
+        retypeAsPdf(retypeSrc).then(settle, () => settle(null));
+        return () => {
+          live2 = false;
+          if (made) URL.revokeObjectURL(made);
+          setRetyped((cur) => cur?.from === retypeSrc ? null : cur);
+        };
+      }, [retypeSrc]);
+      const settled = retyped && retyped.from === retypeSrc ? retyped : null;
+      const src = plan?.mode === "direct" ? plan.src : settled?.url ?? null;
+      const loading = plan?.mode === "retype" && !settled;
       const ph = typeof props.height === "number" && props.height > 0 ? props.height : void 0;
       const frame = {
         width: "100%",
@@ -27066,7 +27136,19 @@ var init_renderNode = __esm({
         overflow: "hidden",
         ...wrap
       };
-      if (!ok) {
+      if (loading) {
+        return /* @__PURE__ */ jsx6(
+          "div",
+          {
+            "data-himalaya-pdf": "loading",
+            role: "img",
+            "aria-label": "loading document",
+            "aria-busy": "true",
+            style: { ...frame, background: "#f4f4f4" }
+          }
+        );
+      }
+      if (!src) {
         return /* @__PURE__ */ jsx6(
           "div",
           {
@@ -27082,7 +27164,7 @@ var init_renderNode = __esm({
         "object",
         {
           "data-himalaya-pdf": "document",
-          data: rawUrl + startPage,
+          data: src + (plan?.mode === "retype" ? startPage || sourceFragment(retypeSrc) : startPage),
           type: "application/pdf",
           "aria-label": typeof props.title === "string" && props.title ? props.title : "PDF document",
           style: frame
@@ -49241,21 +49323,21 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-Dn3oPAne.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1044844, sha256: "7b781f264f2aac500b00ea4def7cb6f3c19e46dd4ebb3b797de5da8386056543" },
-      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1044852, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
-      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1049462, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1538046, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1628970, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1719954, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1810934, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1901806, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1992786, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2101422, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2210506, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2319554, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2427254, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2515362, length: 4947, sha256: "25d01e5f772c7b782ca7c68f997765d3838295369054c0855ba63320d071ec22" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2520309, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
+      { key: "assets/index---zsKTyk.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1046198, sha256: "4ca35bb22d26776fdb371a4cfb2137ecbb7bd03924695269ac6364171187fe89" },
+      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1046206, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
+      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1050816, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1539400, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1630324, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1721308, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1812288, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1903160, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1994140, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2102776, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2211860, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2320908, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2428608, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2516716, length: 4947, sha256: "684c954fbc5b82e4513932286c45f00f08b2d988c71614f0700f3cc57716fa84" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2521663, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
     ];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1028.0",
+  "version": "0.1029.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -65,5 +65,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "59c5cc0524f87f37cc078c95033304d90d56388bf25c7622625cbe9c"
+  "falconPackageHash": "785b6d68758b001717f983ccbdad398a5765dced9bf5544af3865811"
 }

package/templates/beauty-salon/dev/index.ts

@@ -144,10 +144,22 @@ const SCREENS = runtimeSetting({
                           }
                         },
                         "cornerRadius": 8,
-                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton",
-                        "padding": {
-                          "bottom": 16
+                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton"
+                      }
+                    },
+                    {
+                      "id": "himi_branded_home.salon.hero_skeleton.gap",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "children": []
                         }
+                      },
+                      "modifiers": {
+                        "height": 16,
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton"
                       }
                     },
                     {

package/templates/beauty-salon-owner/dev/index.ts

@@ -55191,7 +55191,7 @@ const SCREENS = runtimeSetting({
                           "spacing": 3,
                           "children": [
                             {
-                              "id": "himi_owner_lite_aria.msg_$item.id.who",
+                              "id": "himi_owner_lite_aria.msg_$item.id.content",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
@@ -55210,43 +55210,34 @@ const SCREENS = runtimeSetting({
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.bubble",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$item.who",
-                                          "style": "footnote",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "text": "$item.content",
+                                          "style": "body",
+                                          "maxLines": 50
                                         }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_owner_lite_aria.msg_$item.id.content",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
                                       },
                                       "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "padding": {
+                                          "leading": 16,
+                                          "trailing": 16,
+                                          "top": 8,
+                                          "bottom": 8
+                                        },
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 20,
+                                        "maxWidth": 300,
                                         "hiddenPath": "$item.notUser"
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.text",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
@@ -55255,6 +55246,10 @@ const SCREENS = runtimeSetting({
                                           "style": "body",
                                           "maxLines": 50
                                         }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "hiddenPath": "$item.notAria"
                                       }
                                     }
                                   ]

package/templates/beauty-salon-owner/tier5-src/_shared/aria-chat.ts

@@ -83,6 +83,11 @@ export interface AriaBubble {
    *  that right-aligns the owner renders two templates and collapses one. */
   notUser: boolean;
   notAria: boolean;
+  /** What a screen reader says for the row: the author, then the words. A
+   *  screen that draws the speaker only as a bubble and a side of the screen
+   *  (`messageStyle: 'userBubble'`) has no visible author line to read, and
+   *  without this the owner's question and Aria's reply sound the same. */
+  spoken: string;
   link1Label: string; link1Url: string; link1Hidden: boolean;
   link2Label: string; link2Url: string; link2Hidden: boolean;
   link3Label: string; link3Url: string; link3Hidden: boolean;
@@ -561,9 +566,23 @@ export function disclosedLabel(link: { label: string; url: string }): string {
  *  machinery dies. (Measured: 20 tests, every one of them about polling.) */
 export { stripMarkdown };
 
+/** The screen-reader line for a bubble — see `AriaBubble.spoken`. */
+export function spokenOf(who: string, content: string): string {
+  return who ? `${who}: ${content}` : content;
+}
+
+/** A persisted transcript from before `spoken` existed, made whole. A `$item.`
+ *  path missing on a row does not substitute, so a row without the field would
+ *  announce the literal binding until the next rebuild replaced it. */
+export function withSpoken(bubbles: AriaBubble[]): AriaBubble[] {
+  return bubbles.every((b) => typeof b.spoken === "string")
+    ? bubbles
+    : bubbles.map((b) => (typeof b.spoken === "string" ? b : { ...b, spoken: spokenOf(b.who, b.content) }));
+}
+
 /** A greeting or optimistic bubble: no links, all slots defaulted. */
 export function plainBubble(id: string, role: string, who: string, content: string): AriaBubble {
-  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", ...linkFieldsOf("", role) };
+  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", spoken: spokenOf(who, content), ...linkFieldsOf("", role) };
 }
 
 /** Server transcript → bubbles. USER text is literal; ASSISTANT replies are
@@ -644,6 +663,7 @@ function bubbleOf(id: string, role: string, who: string, raw: string, writing: b
     content,
     notUser: role !== "USER",
     notAria: role === "USER",
+    spoken: spokenOf(who, content),
     ...linkFieldsOf(prose, role),
   };
 }
@@ -2004,7 +2024,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // a rehydrated turn there was no ladder at all, leaving "Aria is
         // typing…" on screen with nothing ever fetching the answer.
         if (s._pending || s.status === "sending") {
-          const held: AriaChatState = { ...s, status: "sending", prompts: [] };
+          const held: AriaChatState = { ...s, status: "sending", prompts: [], messages: withSpoken(s.messages) };
           return cadence(held, o.poll ? o.poll.fastMs : null, null);
         }
         // …but the self-kick pass runs BEFORE the pack is stashed, so the
@@ -2013,7 +2033,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // still the only thing on screen — `prompts` is already recomputed
         // here, and a chip pack that localizes beside a greeting that does not
         // is the visible half of the same bug.
-        const messages = isGreetingOnly(s.messages) ? greetingOnly() : s.messages;
+        const messages = isGreetingOnly(s.messages) ? greetingOnly() : withSpoken(s.messages);
         return { ...s, status: "ready", messages, prompts: promptsFor(messages, promptList()) };
       }
       try {

package/templates/branded-lite/dev/index.ts

@@ -190,10 +190,22 @@ const SCREENS = runtimeSetting({
                           }
                         },
                         "cornerRadius": 8,
-                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton",
-                        "padding": {
-                          "bottom": 16
+                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton"
+                      }
+                    },
+                    {
+                      "id": "himi_branded_home.hero_skeleton.gap",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "children": []
                         }
+                      },
+                      "modifiers": {
+                        "height": 16,
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBrandedHome.hideHeroSkeleton"
                       }
                     },
                     {
@@ -294,8 +306,24 @@ const SCREENS = runtimeSetting({
                           "leading": 24,
                           "trailing": 24,
                           "top": 24,
-                          "bottom": 16
+                          "bottom": 24
                         },
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBrandedHome.hideHeroFallback"
+                      }
+                    },
+                    {
+                      "id": "himi_branded_home.hero.gap",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "children": []
+                        }
+                      },
+                      "modifiers": {
+                        "height": 16,
+                        "fillMaxWidth": true,
                         "hiddenPath": "$service:himiBrandedHome.hideHeroFallback"
                       }
                     },

package/templates/community-club-owner/dev/index.ts

@@ -55191,7 +55191,7 @@ const SCREENS = runtimeSetting({
                           "spacing": 3,
                           "children": [
                             {
-                              "id": "himi_owner_lite_aria.msg_$item.id.who",
+                              "id": "himi_owner_lite_aria.msg_$item.id.content",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
@@ -55210,43 +55210,34 @@ const SCREENS = runtimeSetting({
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.bubble",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$item.who",
-                                          "style": "footnote",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "text": "$item.content",
+                                          "style": "body",
+                                          "maxLines": 50
                                         }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_owner_lite_aria.msg_$item.id.content",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
                                       },
                                       "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "padding": {
+                                          "leading": 16,
+                                          "trailing": 16,
+                                          "top": 8,
+                                          "bottom": 8
+                                        },
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 20,
+                                        "maxWidth": 300,
                                         "hiddenPath": "$item.notUser"
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.text",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
@@ -55255,6 +55246,10 @@ const SCREENS = runtimeSetting({
                                           "style": "body",
                                           "maxLines": 50
                                         }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "hiddenPath": "$item.notAria"
                                       }
                                     }
                                   ]

package/templates/community-club-owner/tier5-src/_shared/aria-chat.ts

@@ -83,6 +83,11 @@ export interface AriaBubble {
    *  that right-aligns the owner renders two templates and collapses one. */
   notUser: boolean;
   notAria: boolean;
+  /** What a screen reader says for the row: the author, then the words. A
+   *  screen that draws the speaker only as a bubble and a side of the screen
+   *  (`messageStyle: 'userBubble'`) has no visible author line to read, and
+   *  without this the owner's question and Aria's reply sound the same. */
+  spoken: string;
   link1Label: string; link1Url: string; link1Hidden: boolean;
   link2Label: string; link2Url: string; link2Hidden: boolean;
   link3Label: string; link3Url: string; link3Hidden: boolean;
@@ -561,9 +566,23 @@ export function disclosedLabel(link: { label: string; url: string }): string {
  *  machinery dies. (Measured: 20 tests, every one of them about polling.) */
 export { stripMarkdown };
 
+/** The screen-reader line for a bubble — see `AriaBubble.spoken`. */
+export function spokenOf(who: string, content: string): string {
+  return who ? `${who}: ${content}` : content;
+}
+
+/** A persisted transcript from before `spoken` existed, made whole. A `$item.`
+ *  path missing on a row does not substitute, so a row without the field would
+ *  announce the literal binding until the next rebuild replaced it. */
+export function withSpoken(bubbles: AriaBubble[]): AriaBubble[] {
+  return bubbles.every((b) => typeof b.spoken === "string")
+    ? bubbles
+    : bubbles.map((b) => (typeof b.spoken === "string" ? b : { ...b, spoken: spokenOf(b.who, b.content) }));
+}
+
 /** A greeting or optimistic bubble: no links, all slots defaulted. */
 export function plainBubble(id: string, role: string, who: string, content: string): AriaBubble {
-  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", ...linkFieldsOf("", role) };
+  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", spoken: spokenOf(who, content), ...linkFieldsOf("", role) };
 }
 
 /** Server transcript → bubbles. USER text is literal; ASSISTANT replies are
@@ -644,6 +663,7 @@ function bubbleOf(id: string, role: string, who: string, raw: string, writing: b
     content,
     notUser: role !== "USER",
     notAria: role === "USER",
+    spoken: spokenOf(who, content),
     ...linkFieldsOf(prose, role),
   };
 }
@@ -2004,7 +2024,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // a rehydrated turn there was no ladder at all, leaving "Aria is
         // typing…" on screen with nothing ever fetching the answer.
         if (s._pending || s.status === "sending") {
-          const held: AriaChatState = { ...s, status: "sending", prompts: [] };
+          const held: AriaChatState = { ...s, status: "sending", prompts: [], messages: withSpoken(s.messages) };
           return cadence(held, o.poll ? o.poll.fastMs : null, null);
         }
         // …but the self-kick pass runs BEFORE the pack is stashed, so the
@@ -2013,7 +2033,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // still the only thing on screen — `prompts` is already recomputed
         // here, and a chip pack that localizes beside a greeting that does not
         // is the visible half of the same bug.
-        const messages = isGreetingOnly(s.messages) ? greetingOnly() : s.messages;
+        const messages = isGreetingOnly(s.messages) ? greetingOnly() : withSpoken(s.messages);
         return { ...s, status: "ready", messages, prompts: promptsFor(messages, promptList()) };
       }
       try {