@wix/himalaya-cli 0.1318.0 → 0.1320.0

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-aria/index.ts

@@ -28,7 +28,7 @@ import { defineService } from "@himalaya/state";
 import { open } from "@himalaya/open-url";
 import { writeText } from "@himalaya/clipboard";
 import { availability, recognizeOnce, stop as stopSpeech } from "@himalaya/speech";
-import { capturePhoto } from "@himalaya/camera";
+import { capturePhoto, pickDocument } from "@himalaya/camera";
 import { put } from "@himalaya/presigned-upload";
 import { alert } from "@himalaya/ui";
 import { auth } from "@himalaya/wix-platform";
@@ -250,12 +250,13 @@ const core = createAriaChat({
     widgetItemsUnavailable: () => copyParam("ownerAria.widget.itemsUnavailable", "Items aren't available here."),
     attachUploading: () => copyParam("ownerAria.attach.uploading", "Uploading…"),
     attachFailed: () => copyParam("ownerAria.attach.failed", "Couldn't upload"),
-    attachTooMany: (max) => copyTemplate("ownerAria.attach.tooMany", "You can attach up to {max} photos.", { max }),
+    attachTooMany: (max) => copyTemplate("ownerAria.attach.tooMany", "You can attach up to {max} files.", { max }),
     attachUnsupported: () => copyParam("ownerAria.attach.unsupported", "That file type can't be attached."),
-    attachTooLarge: (mb) => copyTemplate("ownerAria.attach.tooLarge", "That photo is too large to attach (up to {mb} MB).", { mb }),
-    attachWaitUploading: () => copyParam("ownerAria.attach.waitUploading", "Wait for your photo to finish uploading."),
-    attachWaitFailed: () => copyParam("ownerAria.attach.waitFailed", "Retry or remove the photo that didn't upload."),
-    attachNeedsText: () => copyParam("ownerAria.attach.needsText", "Add a message to send with your photo."),
+    attachTooLarge: (mb) => copyTemplate("ownerAria.attach.tooLarge", "That file is too large to attach (up to {mb} MB).", { mb }),
+    attachWaitUploading: () => copyParam("ownerAria.attach.waitUploading", "Wait for your file to finish uploading."),
+    attachWaitFailed: () => copyParam("ownerAria.attach.waitFailed", "Retry or remove the file that didn't upload."),
+    attachWaitRemove: () => copyParam("ownerAria.attach.waitRemove", "Remove the file that didn't upload, then add it again."),
+    attachNeedsText: () => copyParam("ownerAria.attach.needsText", "Add a message to send with your file."),
     toolFailed: () => copyParam("ownerAria.toolFailed", "Aria couldn't finish that. Try again."),
   },
   clientTools: { confirm: confirmWithOwner, userAgent },
@@ -305,6 +306,10 @@ const core = createAriaChat({
   // which go to a self-authorizing url with no Wix credential attached.
   attachments: {
     pick: async (source) => {
+      if (source === "document") {
+        const file = await pickDocument();
+        return file ? { dataUri: file.uri, name: file.name, mimeType: file.mime } : null;
+      }
       const asset = await capturePhoto({ source, maxEdgePixels: 2048 });
       return asset ? { dataUri: asset.uri, mimeType: asset.mime } : null;
     },
@@ -318,6 +323,92 @@ const core = createAriaChat({
   },
 });
 
+// Focused native TextFields keep their local non-empty edit rather than adopting
+// worker normalization (the shared shouldAdoptWorkerValue rule). Remember only
+// prefixes where THIS draft actually selected a reference, so later editor echoes and
+// the Form.message submission cannot restore those triggers into the wire text.
+// Email addresses and newly authored @ characters are never blanket-stripped.
+let mentionTriggerPrefixes: string[] = [];
+let pendingMentionTrigger: { rawPrefix: string; prefix: string } | null = null;
+let mentionDraftRevision = 0;
+let previousMentionRaw = "";
+// Set by a selection that consumed a typed trigger: the normalized draft the
+// worker now holds. A field that blurs adopts that value WITHOUT dispatching
+// typing, so the next keystroke is an edit of it, not of previousMentionRaw.
+// The first typing after a selection whose raw value is byte-identical to the
+// pre-selection one cannot be an edit of the focused raw text (nothing changed),
+// so it is read as an edit of the adopted draft: that field holds no consumed
+// marker any more, and a standalone @ there is a new trigger.
+let adoptedMentionDraft: string | null = null;
+function reconcileMentionDraft(raw: string): string {
+  // Move consumed trigger positions with an edit anywhere in the focused field.
+  // A replaced/deleted trigger loses its marker, so newly authored @ text stays literal.
+  let start = 0;
+  while (start < previousMentionRaw.length && start < raw.length && previousMentionRaw[start] === raw[start]) start += 1;
+  let suffix = 0;
+  while (suffix < previousMentionRaw.length - start && suffix < raw.length - start
+    && previousMentionRaw[previousMentionRaw.length - suffix - 1] === raw[raw.length - suffix - 1]) suffix += 1;
+  const end = previousMentionRaw.length - suffix;
+  const delta = raw.length - previousMentionRaw.length;
+  const move = (position: number): number | null => position < start ? position : position >= end ? position + delta : null;
+  mentionTriggerPrefixes = mentionTriggerPrefixes.flatMap(prefix => {
+    let position = move(prefix.length);
+    // A whole-draft replacement ("Ask @" → "New @") shares only whitespace and the @
+    // with the old text, so the common suffix lines the NEW @ up with the old marker.
+    // When every word before the marker was replaced, its context is gone: the @ is
+    // newly authored and must stay (and may open the picker again).
+    if (position !== null && start === 0 && prefix.length >= end && prefix.trim()
+      && !previousMentionRaw.slice(end, prefix.length).trim()) return [];
+    // Coalesced edits may add text on both sides of the marker. Keep it when
+    // its complete previous context still occurs exactly once in the new value.
+    if (position === null && prefix) {
+      const anchor = `${prefix}@`; const found = raw.indexOf(anchor);
+      if (found >= 0 && raw.indexOf(anchor, found + 1) < 0) position = found + prefix.length;
+    }
+    // A coalesced focused-field edit can replace context on both sides of a
+    // selected marker. If this is the sole consumed marker and the new draft
+    // has one standalone @, its position is unambiguous even without the old
+    // prefix. Email addresses and authored @suffixes are never candidates.
+    if (position === null && mentionTriggerPrefixes.length === 1) {
+      const candidates = [...raw.matchAll(/(^|\s)@(?=\s|$)/g)].map(match => match.index! + match[1].length);
+      if (candidates.length === 1) position = candidates[0];
+    }
+    // Only the standalone trigger that opened the picker is consumed. Adding
+    // a literal suffix (or joining it to the preceding word) authors ordinary
+    // @ text even when the focused editor retains the selected trigger.
+    const standalone = position !== null && raw[position] === "@"
+      && (position === 0 || /\s/.test(raw[position - 1]))
+      && (position + 1 === raw.length || /\s/.test(raw[position + 1]));
+    return standalone ? [raw.slice(0, position!)] : [];
+  });
+  if (pendingMentionTrigger) {
+    const position = move(pendingMentionTrigger.rawPrefix.length);
+    const standalone = position !== null && raw[position] === "@"
+      && (position === 0 || /\s/.test(raw[position - 1]))
+      && (position + 1 === raw.length || /\s/.test(raw[position + 1]));
+    pendingMentionTrigger = standalone
+      ? { rawPrefix: raw.slice(0, position!), prefix: raw.slice(0, position!) } : null;
+    if (pendingMentionTrigger) {
+      for (const prefix of [...mentionTriggerPrefixes].sort((a, b) => b.length - a.length)) {
+        if (prefix.length < pendingMentionTrigger.rawPrefix.length) pendingMentionTrigger.prefix = pendingMentionTrigger.prefix.slice(0, prefix.length) + pendingMentionTrigger.prefix.slice(prefix.length + 1);
+      }
+    }
+  }
+  previousMentionRaw = raw;
+  let text = raw;
+  for (const prefix of [...mentionTriggerPrefixes].sort((a, b) => b.length - a.length)) {
+    text = text.slice(0, prefix.length) + text.slice(prefix.length + 1);
+  }
+  return text;
+}
+function reconciledMentionArg(arg?: AriaActionArg): AriaActionArg | undefined {
+  if (typeof arg === "string") return reconcileMentionDraft(arg);
+  if (!arg) return arg;
+  const keys: Array<"message" | "text" | "value" | "intent" | "id"> = ["message", "text", "value", "intent", "id"];
+  const key = keys.find(k => typeof arg[k] === "string" && arg[k]);
+  return key ? { ...arg, [key]: reconcileMentionDraft(String(arg[key])) } : arg;
+}
+
 const svc = defineService<AriaChatState, {
   load: (s: AriaChatState, arg?: AriaActionArg) => Promise<AriaChatState>;
   submit: (s: AriaChatState, arg?: AriaActionArg) => Promise<AriaChatState>;
@@ -374,13 +465,51 @@ const svc = defineService<AriaChatState, {
   state: core.initialState,
   actions: {
     // `load` is the onAppear dispatch, so it is where the copy pack arrives.
-    load: (s, arg) => { stashCopy(arg); stashTargets(arg); stashRealtimeUrl(arg); return core.load(s); },
-    submit: core.submit,
-    submitPrompt: core.submitPrompt,
-    newChat: core.newChat,
+    load: (s, arg) => { mentionDraftRevision += 1; mentionTriggerPrefixes = []; pendingMentionTrigger = null; previousMentionRaw = ""; adoptedMentionDraft = null; stashCopy(arg); stashTargets(arg); stashRealtimeUrl(arg); return core.load(s); },
+    submit: async (s, arg) => {
+      const normalized = reconciledMentionArg(arg);
+      const previousPrefixes = mentionTriggerPrefixes; const previousTrigger = pendingMentionTrigger;
+      const revision = mentionDraftRevision;
+      const next = await core.submit(s, normalized);
+      // A refusal keeps this draft; a later keystroke/new-chat belongs to its own.
+      if (revision === mentionDraftRevision) {
+        if (next.input && next.input === s.input) { mentionTriggerPrefixes = previousPrefixes; pendingMentionTrigger = previousTrigger; }
+        else { mentionTriggerPrefixes = []; pendingMentionTrigger = null; previousMentionRaw = ""; adoptedMentionDraft = null; }
+      }
+      return next;
+    },
+    submitPrompt: async (s, arg) => {
+      const previousPrefixes = mentionTriggerPrefixes; const previousTrigger = pendingMentionTrigger;
+      const revision = mentionDraftRevision;
+      const next = await core.submitPrompt(s, arg);
+      if (revision === mentionDraftRevision) {
+        if (next.input && next.input === s.input) { mentionTriggerPrefixes = previousPrefixes; pendingMentionTrigger = previousTrigger; }
+        else { mentionTriggerPrefixes = []; pendingMentionTrigger = null; previousMentionRaw = ""; adoptedMentionDraft = null; }
+      }
+      return next;
+    },
+    newChat: (s) => { mentionDraftRevision += 1; mentionTriggerPrefixes = []; pendingMentionTrigger = null; previousMentionRaw = ""; adoptedMentionDraft = null; return core.newChat(s); },
     // The composer's onChange. Mirrors the draft into state so `submit` can
     // empty it and the field actually clears.
-    typing: core.typing,
+    typing: (s, arg) => {
+      mentionDraftRevision += 1;
+      const raw = typeof arg === "string" ? arg : ([arg?.value, arg?.text, arg?.message].find((v): v is string => typeof v === "string") ?? "");
+      if (adoptedMentionDraft !== null) {
+        if (raw === previousMentionRaw) { mentionTriggerPrefixes = []; previousMentionRaw = adoptedMentionDraft; }
+        adoptedMentionDraft = null;
+      }
+      const next = core.typing(s, { value: reconcileMentionDraft(raw) });
+      // A standalone @ asks for a reference; emails and embedded @ characters
+      // remain ordinary text. A successful selection consumes its trigger.
+      if (next.input !== s.input && /(?:^|\s)@$/.test(next.input) && !next.mention.openHidden) {
+        // Keep the fragment editable until a reference is selected. Cancelling
+        // the picker must not turn a literal @example.com into example.com.
+        pendingMentionTrigger = { rawPrefix: raw.slice(0, -1), prefix: next.input.slice(0, -1) };
+        void svc.mentionOpen();
+        return next;
+      }
+      return next;
+    },
     // Named by the `_poll` directive above. A name that does not resolve here is
     // a `poll-action-missing` error in `himi test --content`.
     tick: core.tick,
@@ -419,11 +548,23 @@ const svc = defineService<AriaChatState, {
     // chips above the composer. Every one is named by the descriptor, so every
     // one has to be exported here — see the note on the picker family above.
     mentionOpen: core.mentionOpen,
-    mentionClose: core.mentionClose,
+    mentionClose: (s) => { pendingMentionTrigger = null; return core.mentionClose(s); },
     mentionBack: core.mentionBack,
     mentionProvider: core.mentionProvider,
     mentionQuery: core.mentionQuery,
-    mentionPick: core.mentionPick,
+    mentionPick: (s, arg) => {
+      const next = core.mentionPick(s, arg);
+      const trigger = pendingMentionTrigger;
+      if (trigger && !s.mention.hidden && next.mention.hidden && next.input.startsWith(`${trigger.prefix}@`)) {
+        mentionDraftRevision += 1;
+        pendingMentionTrigger = null;
+        if (!mentionTriggerPrefixes.includes(trigger.rawPrefix)) mentionTriggerPrefixes.push(trigger.rawPrefix);
+        const normalized = next.input.slice(0, trigger.prefix.length) + next.input.slice(trigger.prefix.length + 1);
+        adoptedMentionDraft = normalized;
+        return core.typing(next, { value: normalized });
+      }
+      return next;
+    },
     mentionRemove: core.mentionRemove,
     // The composer's photos. `attachmentSettled` is dispatched by the upload
     // itself (see `attachments.settled` above), never by the descriptor.