@wix/himalaya-cli 0.1633.0 → 0.1634.0

package/templates/branded-lite/tier5-src/business-chat/index.ts

@@ -13,7 +13,7 @@ import { hostSiteFromInput } from '../_shared/branded-lite-hosted.js';
 import { productImage, searchStoreProducts } from '../_shared/himi-store.js';
 import { queryServices } from '@himalaya/wix-bookings';
 
-type PendingIntent = BusinessChatIntent;
+type PendingIntent = BusinessChatIntent & { suggestionId?:string; answerTo?:string };
 // Only what the screen reads. This state crosses into the worker on every keystroke, so a row carries no raw
 // parts, plain text or text runs: they would be re-sent each time for nothing.
 type BusinessMessageRow = Pick<MessageRow,'id'|'sender'|'when'|'createdDate'|'mine'> & {
@@ -23,7 +23,7 @@ type BusinessMessageRow = Pick<MessageRow,'id'|'sender'|'when'|'createdDate'|'mi
  /** Only the member's own row that the server has not returned yet. */
  pending?:boolean;
  /** Confirmed local delivery, retained until the authoritative history returns it. */
- acceptedIntent?:BusinessChatIntent;
+ acceptedIntent?:PendingIntent;
 };
 type State = {
   phase:'loading'|'ready'|'error'|'guest'; error:string; notice:string; member:boolean;
@@ -115,12 +115,31 @@ async function sendBusinessVisitorOption(options:BusinessVisitorOptions|null|und
 function liveDescription(state:string,reason:string):string{return businessRealtimeStatusLabel(state,reason);}
 /** The member's own message as it shows the instant they tap Send, before the server has answered. It carries the
  *  id sent to the server, so the real message replaces it once history returns it. */
-function pendingRow(intent:BusinessChatIntent):BusinessMessageRow{
+function pendingRow(intent:PendingIntent):BusinessMessageRow{
  const when=intent.delivery==='sending'?businessChatCopy('sending'):intent.delivery==='unconfirmed'?businessChatCopy('unconfirmed'):messageTimeLabel(intent.createdDate);
  return {id:intent.id,sender:'',when,createdDate:intent.createdDate,mine:true,
   senderAvatar:'',senderName:intent.senderName??'',senderInitials:'',senderBadge:'',imageUrl:'',imageDescription:'',noImage:true,bodyText:intent.text,bodyMarkdown:intent.text,
   suggestions:[],articleActions:[],couponCode:'',noCoupon:true,notMine:false,isCard:false,notCard:true,noSuggestions:true,noActions:true,cardTitle:'',cardDetail:'',noCardText:true,dayLabel:'',dayHidden:true,startsDay:false,scrollAnchor:`himi_business_chat.message_${intent.id}`,pending:true,acceptedIntent:intent.delivery==='sent'?intent:undefined};
 }
+/** Keep a selected option in its turn while Wix omits its visible text from history. */
+/** Selected options whose exact record history has returned. A state built from an older snapshot has lost
+ *  the anchor that matched them by text, so every path asks this before it adds a local row. */
+const seenSelections=new Set<string>();
+function placeLocalRow(messages:BusinessMessageRow[],intent:PendingIntent,source:State['transcriptSource']):BusinessMessageRow[]{
+ const after=intent.afterId?messages.findIndex(row=>row.id===intent.afterId):-1;
+ const beforeAll=intent.fromStart||!!intent.suggestionId&&source==='smart-chat';
+ const at=after>=0?after+1:beforeAll?0:messages.length;
+ return [...messages.slice(0,at),pendingRow(intent),...messages.slice(at)];
+}
+/** The selection is visible only when the exact answer's selected record produced a row. */
+function selectedOptionVisible(aiMessages:unknown[],messages:BusinessMessageRow[],intent:PendingIntent):boolean{
+ if(!intent.answerTo)return false;
+ return aiMessages.some(value=>{
+  const message=value as {id?:unknown;sender?:unknown;messageType?:unknown;answerTo?:unknown}|null;
+  return message?.sender==='SITE_VISITOR'&&message.messageType==='VISITOR_OPTION_SELECTED'&&message.answerTo===intent.answerTo&&
+   messages.some(row=>row.id===`smart-chat:${message.id}`&&row.mine&&row.bodyText.trim()===intent.text.trim());
+ });
+}
 function shape(s:State):State{const used=new Set(s.usedSuggestionIds);const messages=s.messages.map(row=>({...row,noSuggestions:s.phase!=='ready'||!(row.suggestions||[]).length,suggestions:(row.suggestions||[]).map(button=>used.has(button.id)?{...button,enabled:false,disabled:true}:button)}));const quickReplies=(s.quickReplies||[]).map(button=>used.has(button.id)?{...button,enabled:false,disabled:true}:button);const quickEnabled=s.phase==='ready'&&quickReplies.some(button=>button.enabled);return {...s,messages,quickReplies,hasQuickReplies:quickEnabled,noQuickReplies:!quickEnabled,scrollAnchor:messages[messages.length-1]?.scrollAnchor||'',liveLabel:liveDescription(s.liveState,s.liveReason),hasActiveRoom:!!s.roomId,noActiveRoom:!s.roomId,hasHostedName:!!s.hostedName,noHostedName:!s.hostedName,isGuest:s.phase==='guest',notGuest:s.phase!=='guest',realtimeDiagnostic:`state=${s.liveState}; reason=${s.liveReason||'none'}; events=${s.realtimeEventCount}; lastType=${/^(message|messagesent)$/i.test(s.lastRealtimeEventType)?s.lastRealtimeEventType:'none'}`,errorText:s.error,loadingHidden:s.phase!=='loading'||!!s.error,noError:!s.error,noNotice:!s.notice,noMessages:!messages.length,hasMessages:!!messages.length,noEmpty:s.phase!=='ready'||!!messages.length,
   notLoading:s.phase!=='loading',sendDisabled:!canSend(s,s.draft),sendEnabled:canSend(s,s.draft),noLive:!s.roomId||s.liveState==='connected'};}
 /** Smart Chat resolves the conversation from the member identity, including the first message.
@@ -276,7 +295,7 @@ function safeError(error:unknown,operation:'load'|'send'|'init'):string{
 }
 async function endSubscription():Promise<void>{const id=subscriptionId;subscriptionId='';if(id)try{await unsubscribeRealtime({subscriptionId:id});}catch{}}
 function clearPrivate(s:State,phase:'guest'|'error'='guest'):State{
- attachmentUrls.clear();productImages.clear();productImageLookups.clear();serviceIds.clear();serviceIdLookups.clear();currentIdentity=null;businessParticipantId='';epoch++;void endSubscription();
+ attachmentUrls.clear();seenSelections.clear();productImages.clear();productImageLookups.clear();serviceIds.clear();serviceIdLookups.clear();currentIdentity=null;businessParticipantId='';epoch++;void endSubscription();
  return shape({...initial,phase,error:phase==='guest'?businessChatCopy('signInPrompt'):s.error});
 }
 let refreshTail:Promise<unknown>=Promise.resolve();
@@ -327,15 +346,20 @@ async function refreshHistory(s:State):Promise<State|undefined>{
   // What was typed while this ran is kept even on the first load, when the live state is still empty.
   const liveDraft=draftRevision!==startDraftRevision?latest.draft:s.draft;
   const base:State=same?withLiveFields({...s,roomId:latest.roomId||roomId},latest,liveDraft):{...s,draft:liveDraft};
-  const intentObserved=intentObservedIn(messages,base.pendingIntent,historySource);
-  const draft=intentObserved&&base.pendingIntent&&base.draft.trim()===base.pendingIntent.text?'':base.draft;
+  const observed=(visible:BusinessMessageRow[],intent:PendingIntent|null)=>{
+   if(intent&&selectedOptionVisible(aiRead.messages,visible,intent))seenSelections.add(intent.id);
+   return intentObservedIn(visible,intent,historySource);
+  };
+  const intentObserved=observed(messages,base.pendingIntent);
+  // A selected option never sits in the composer, so its text must not clear a draft that happens to match.
+  const draft=intentObserved&&base.pendingIntent&&!base.pendingIntent.suggestionId&&base.draft.trim()===base.pendingIntent.text?'':base.draft;
   // A send the server has not returned yet stays on screen until history does. Seeing it in history only replaces the
   // placeholder: a send still in flight stays pending until its own request settles it, so its outcome is never lost.
   // An unconfirmed one (its request is over) no longer holds Send once its words show up; its notice stays.
-  const shown=!intentObserved&&base.pendingIntent?[...messages,pendingRow(base.pendingIntent)]:messages;
+  const shown=!intentObserved&&base.pendingIntent?base.pendingIntent.suggestionId?placeLocalRow(messages,base.pendingIntent,historySource):[...messages,pendingRow(base.pendingIntent)]:messages;
   const pendingIntent=intentObserved&&base.pendingIntent?.delivery==='unconfirmed'?null:base.pendingIntent;
   const loaded:State={...base,historyRevision:++historyRevision,historySource,transcriptSource:historySource,smartChatEmpty:!aiRead.error&&aiRead.messages.length===0,messages:shown,pendingIntent,visitorOptions,quickReplies:businessVisitorOptionSuggestions(visitorOptions),draft,phase:'ready',error:'',loadFailure:''};
-  return shape(same?withAcceptedRows(loaded,latest):loaded);
+  return shape(same?withAcceptedRows(loaded,latest,observed):loaded);
  }catch(error){
   const wrapped=error instanceof Error?error:new Error('load_failed');
   Object.assign(wrapped,{businessLoadFailure:safeLoadFailure(error)});
@@ -347,25 +371,27 @@ async function refreshHistory(s:State):Promise<State|undefined>{
 function withLiveFields(st:State,latest:State,draft:string):State{
  // The pending intent is always the live one: a send settled meanwhile (null now) must not come back from a snapshot.
  return {...st,draft,pendingIntent:latest.pendingIntent,
-  usedSuggestionIds:[...new Set([...st.usedSuggestionIds,...latest.usedSuggestionIds])],
+  // A rejected send removes its ID from the live state. Unioning an older snapshot would disable it again.
+  usedSuggestionIds:latest.usedSuggestionIds,
   liveState:latest.liveState,liveReason:latest.liveReason,realtimeEventCount:Math.max(st.realtimeEventCount,latest.realtimeEventCount),lastRealtimeEventType:latest.lastRealtimeEventType,
   scrollSend:Math.max(st.scrollSend,latest.scrollSend)};
 }
 /** A successful empty pre-send read anchors accepted Smart Chat rows, never an
  * older Members payload retained after a failed read. Keep both contexts intact. */
 function intentObservedIn(messages:BusinessMessageRow[],intent:BusinessChatIntent|null,source:State['transcriptSource']):boolean{
+ if(intent&&seenSelections.has(intent.id))return true;
  return pendingIntentWasObserved(messages,source==='smart-chat'&&intent?.delivery==='sent'&&intent.smartChatFromStart
   ?{...intent,afterId:undefined,fromStart:true}:intent);
 }
 /** Keep confirmed local deliveries independently of in-flight intent and history revision.
  * Reconcile by the existing stored-id/anchor contract, never by ownership or text alone. */
-function withAcceptedRows(st:State,latest:State):State{
+function withAcceptedRows(st:State,latest:State,observed:(messages:BusinessMessageRow[],intent:PendingIntent)=>boolean=(messages,intent)=>intentObservedIn(messages,intent,st.transcriptSource)):State{
  let messages=st.messages;
  for(const row of [...st.messages,...latest.messages]){
   const intent=row.acceptedIntent;
   if(!intent)continue;
-  if(intentObservedIn(messages,intent,st.transcriptSource))messages=messages.filter(candidate=>!(candidate.id===intent.id&&candidate.pending));
-  else if(!messages.some(candidate=>candidate.id===intent.id))messages=[...messages,row];
+  if(observed(messages,intent))messages=messages.filter(candidate=>!(candidate.id===intent.id&&candidate.pending));
+  else if(!messages.some(candidate=>candidate.id===intent.id))messages=intent.suggestionId?placeLocalRow(messages,intent,st.transcriptSource):[...messages,row];
  }
  return {...st,messages,historySource:smartChatAcceptedEpoch===epoch?'smart-chat':st.historySource};
 }
@@ -384,6 +410,7 @@ function withLiveDraft(st:State):State{
  return intent&&!intentObservedIn(merged.messages,intent,merged.transcriptSource)&&!merged.messages.some(row=>row.id===intent.id)
   ?{...merged,messages:[...merged.messages,pendingRow(intent)]}:merged;
 }
+type SuggestionSession={member:boolean;roomId:string;principal:string;currentPrincipal:string;scope:string;currentScope:string};
 type SendResult={id:string;outcome:'sent'|'rejected'|'unconfirmed'|'signed_out';draft:string;storedId?:string;error?:unknown};
 /** Posts one message and reports how it ended; never throws. The caller already showed the message. The call lasts
  *  until the AI has answered: history usually shows the stored copy first, which replaces the placeholder, while Send
@@ -400,6 +427,35 @@ async function deliver(pending:BusinessChatIntent,draft:string):Promise<void>{
  }
  if(sendEpoch===epoch)void svc.settleSend(result);
 }
+/** An AI visitor option uses the same visible pending row as a typed send. Its Wix request can take until the AI finishes;
+ *  the row and disabled chip are already painted while it runs. */
+async function deliverSuggestion(pending:PendingIntent,rows:{suggestions?:BusinessSuggestion[]}[],options:BusinessVisitorOptions|null,session:SuggestionSession):Promise<void>{
+ const sendEpoch=epoch;
+ let result:SendResult={id:pending.id,outcome:'sent',draft:''};
+ try{
+  await Promise.resolve();
+  const sent=await dispatchBusinessSuggestion(rows,pending.suggestionId!,session,suggestion=>sendBusinessVisitorOption(options,suggestion.label));
+  if(!sent)result={id:pending.id,outcome:'rejected',draft:'',error:new Error('suggestion_unavailable')};
+ }catch(error){
+  const lost=/member_sign_in_required|MemberAccessChanged|\b401\b|\b403\b/i.test(String(error));
+  result={id:pending.id,draft:'',error,outcome:lost?'signed_out':businessChatSendRejected(error)?'rejected':'unconfirmed'};
+ }
+ if(sendEpoch===epoch)void svc.settleSend(result);
+}
+/** A Wix Chat postback is silent: it disables its chip immediately but does not invent an outgoing text message. */
+async function deliverButtonSuggestion(id:string,rows:{suggestions?:BusinessSuggestion[]}[],session:SuggestionSession):Promise<void>{
+ const sendEpoch=epoch;
+ let result:SendResult={id,outcome:'sent',draft:''};
+ try{
+  await Promise.resolve();
+  const sent=await dispatchBusinessSuggestion(rows,id,session,suggestion=>chat.sendButton(me(),session.roomId,{id:newBusinessChatIntent(suggestion.label,session.roomId,session.principal).id,text:suggestion.label,appId:suggestion.appId!,interactionId:suggestion.interactionId!}));
+  if(!sent)result={id,outcome:'rejected',draft:'',error:new Error('suggestion_unavailable')};
+ }catch(error){
+  const lost=/member_sign_in_required|MemberAccessChanged|\b401\b|\b403\b/i.test(String(error));
+  result={id,draft:'',error,outcome:lost?'signed_out':businessChatSendRejected(error)?'rejected':'unconfirmed'};
+ }
+ if(sendEpoch===epoch)void svc.settleButtonSuggestion(result);
+}
 const svc=defineService<State,Record<string,(s:State,a?:unknown)=>State|undefined|Promise<State|undefined>>>('businessChat',{
  state:shape(initial),notHydrated:Object.keys(initial) as (keyof State)[],
  actions:{
@@ -510,6 +566,12 @@ const svc=defineService<State,Record<string,(s:State,a?:unknown)=>State|undefine
    if(result.outcome==='signed_out')return clearPrivate(s,'guest');
    if(result.outcome==='rejected'){
     // The row goes, and the text comes back unless the member has already started something new.
+    if(pending.suggestionId){
+     // A selected option has no draft to restore: its chip is offered again.
+     const restore=(buttons:BusinessSuggestion[])=>buttons.map(button=>button.id===pending.suggestionId?{...button,enabled:true,disabled:false}:button);
+     return shape({...s,messages:s.messages.filter(row=>row.id!==pending.id).map(row=>({...row,suggestions:restore(row.suggestions)})),quickReplies:restore(s.quickReplies),
+      pendingIntent:null,usedSuggestionIds:s.usedSuggestionIds.filter(id=>id!==pending.suggestionId),error:safeError(result.error,'send'),notice:businessChatCopy('suggestionRejected')});
+    }
     return shape({...s,messages:s.messages.filter(row=>row.id!==pending.id),pendingIntent:null,draft:s.draft.trim()?s.draft:result.draft,error:safeError(result.error,'send'),notice:businessChatCopy('rejected')});
    }
    // History cannot tell this send from the same words written elsewhere (the website), so an indeterminate failure is
@@ -517,20 +579,22 @@ const svc=defineService<State,Record<string,(s:State,a?:unknown)=>State|undefine
    if(result.outcome==='unconfirmed'){
     const unconfirmed={...pending,delivery:'unconfirmed' as const};
     const seen=intentObservedIn(s.messages,pending,s.transcriptSource);
-    return shape({...s,pendingIntent:seen?null:unconfirmed,messages:replaceRow(unconfirmed),error:safeError(result.error,'send'),notice:businessChatCopy('checkDelivery')});
+    return shape({...s,pendingIntent:seen?null:unconfirmed,messages:replaceRow(unconfirmed),error:safeError(result.error,'send'),notice:businessChatCopy(pending.suggestionId?'suggestionUnconfirmed':'checkDelivery')});
    }
    const sent={...pending,storedId:result.storedId,delivery:'sent' as const};
+   // A selected option keeps the notice it always had; a typed message shows none once accepted.
+   const sentNotice=sent.suggestionId?businessChatCopy('suggestionSent'):'';
    // Every typed send uses Smart Chat, even when a Members room already exists.
    smartChatAcceptedEpoch=epoch;
-   const accepted=shape({...s,historySource:'smart-chat',pendingIntent:sent,messages:replaceRow(sent),error:'',notice:''});
+   const accepted=shape({...s,historySource:'smart-chat',pendingIntent:sent,messages:replaceRow(sent),error:'',notice:sentNotice});
    const sendEpoch=epoch;
    // The server accepted it, so Send is free again whatever history says; the row stays until history returns it.
    // A refresh that ran while the committed intent still said sending leaves a 'Sending…' row: swap it for the accepted one.
    // History that already holds the message under the server's id needs no placeholder for it. Only this send's intent
    // is cleared: a newer one the live state carried in is that send's to settle.
    const ownIntent=(st:State)=>st.pendingIntent&&st.pendingIntent.id!==sent.id?st.pendingIntent:null;
-   const settled=(st:State):State=>intentObservedIn(st.messages,sent,st.transcriptSource)?shape({...st,pendingIntent:ownIntent(st),notice:'',messages:st.messages.filter(row=>!(row.id===sent.id&&row.pending))}):
-    shape({...st,pendingIntent:ownIntent(st),notice:'',messages:st.messages.some(row=>row.id===sent.id)?st.messages.map(row=>row.id===sent.id&&row.pending?pendingRow(sent):row):[...st.messages,pendingRow(sent)]});
+   const settled=(st:State):State=>intentObservedIn(st.messages,sent,st.transcriptSource)?shape({...st,pendingIntent:ownIntent(st),notice:sentNotice,messages:st.messages.filter(row=>!(row.id===sent.id&&row.pending))}):
+    shape({...st,pendingIntent:ownIntent(st),notice:sentNotice,messages:st.messages.some(row=>row.id===sent.id)?st.messages.map(row=>row.id===sent.id&&row.pending?pendingRow(sent):row):sent.suggestionId?st.messages:[...st.messages,pendingRow(sent)]});
    // The stream finishes after the AI has persisted its answer. Reload even while connected:
    // the Members-room subscription may never see the separate Smart Chat room's event.
    // An existing-room refresh owns the next read. A first acceptance must wait for
@@ -569,53 +633,44 @@ const svc=defineService<State,Record<string,(s:State,a?:unknown)=>State|undefine
     return settled(latestResolved());
    }
   },
-  sendSuggestion:async(s,a)=>{
+  settleButtonSuggestion:async(s,a)=>{
+   const result=a as SendResult|undefined;
+   if(!result||!s.usedSuggestionIds.includes(result.id))return undefined;
+   if(result.outcome==='signed_out')return clearPrivate(s,'guest');
+   if(result.outcome==='rejected'){
+    const restore=(buttons:BusinessSuggestion[])=>buttons.map(button=>button.id===result.id?{...button,enabled:true,disabled:false}:button);
+    return shape({...s,usedSuggestionIds:s.usedSuggestionIds.filter(id=>id!==result.id),quickReplies:restore(s.quickReplies),
+     messages:s.messages.map(row=>({...row,suggestions:restore(row.suggestions)})),error:safeError(result.error,'send'),notice:businessChatCopy('suggestionRejected')});
+   }
+   if(result.outcome==='unconfirmed')return shape({...s,error:safeError(result.error,'send'),notice:businessChatCopy('suggestionUnconfirmed')});
+   const accepted=shape({...s,error:'',notice:businessChatCopy('suggestionSent')});
+   try{
+    const loaded=await loadLatest(accepted,true);
+    return loaded?shape({...loaded,notice:businessChatCopy('suggestionSent')}):undefined;
+   }catch{return shape({...withLiveDraft(accepted),notice:businessChatCopy('suggestionSent')});}
+  },
+  sendSuggestion:(s,a)=>{
    if(suggestionFlight||!s.member||s.phase!=='ready'||!!s.pendingIntent)return s;
    const id=param(a,'id');
    if(!id||s.usedSuggestionIds.includes(id))return s;
    const rows=[{suggestions:s.quickReplies} as {suggestions?:BusinessSuggestion[]},...s.messages];
-   if(!s.roomId&&findBusinessSuggestion(rows,id)?.kind!=='visitor_option')return s;
-   const options=s.visitorOptions;
-   const intent=newBusinessChatIntent('suggestion',s.roomId,s.principal);
-   const sendEpoch=epoch;
+   const suggestion=findBusinessSuggestion(rows,id);
+   // A first conversation has no room yet: only an AI option can start it.
+   if(!suggestion||!s.roomId&&suggestion.kind!=='visitor_option')return s;
+   const currentPrincipal=currentIdentity?.userId||currentIdentity?.email||'';
+   if(!s.principal||s.principal!==currentPrincipal||s.scope!==currentIdentity?.scope)return s;
+   const session:SuggestionSession={member:s.member,roomId:s.roomId,principal:s.principal,currentPrincipal,scope:s.scope,currentScope:currentIdentity?.scope||''};
    suggestionFlight=true;
-   s=shape({...s,usedSuggestionIds:[...s.usedSuggestionIds,id],error:'',notice:''});
-   let accepted:State|undefined;
-   const keptAccepted=():State=>{
-    const latest=withLiveDraft(accepted!);
-    return shape({...latest,historySource:accepted!.historySource==='smart-chat'?'smart-chat':latest.historySource,error:'',notice:businessChatCopy('suggestionSent')});
-   };
-   try{
-    const sent=await dispatchBusinessSuggestion(rows,id,{member:s.member,roomId:s.roomId,principal:s.principal,currentPrincipal:currentIdentity?.userId||currentIdentity?.email||'',scope:s.scope,currentScope:currentIdentity?.scope||''},suggestion=>suggestion.kind==='visitor_option'
-      ? sendBusinessVisitorOption(options,suggestion.label)
-      : chat.sendButton(me(),s.roomId,{id:intent.id,text:suggestion.label,appId:suggestion.appId!,interactionId:suggestion.interactionId!}));
-    if(sendEpoch!==epoch)return undefined;
-    if(!sent)return withLiveDraft(s);
-    const latest=readServiceState();
-    if(latest.principal!==s.principal||latest.scope!==s.scope||(latest.roomId!==s.roomId&&(!!s.roomId||findBusinessSuggestion(rows,id)?.kind!=='visitor_option')))return undefined;
-    if(findBusinessSuggestion(rows,id)?.kind==='visitor_option')smartChatAcceptedEpoch=epoch;
-    accepted=shape({...latest,historySource:smartChatAcceptedEpoch===epoch?'smart-chat':latest.historySource,usedSuggestionIds:[...new Set([...s.usedSuggestionIds,...latest.usedSuggestionIds])],scrollSend:latest.scrollSend+1,error:'',notice:businessChatCopy('suggestionSent')});
-    const loaded=await loadLatest(keptAccepted(),true);
-    if(!loaded||sendEpoch!==epoch)return undefined;
-    accepted=loaded;
-    if(!accepted.roomId){
-     const room=await resolveExistingBusinessRoom(sendEpoch,s.businessName);
-     if(sendEpoch!==epoch)return undefined;
-     const current=keptAccepted();
-     if(room&&!current.roomId)businessParticipantId=room.participantId;
-     accepted={...current,roomId:current.roomId||room?.id||'',historySource:'smart-chat'};
-    }
-    return keptAccepted();
-   }catch(error){
-    if(sendEpoch!==epoch)return undefined;
-    if(/member_sign_in_required|MemberAccessChanged|\b401\b|\b403\b/i.test(String(error)))return clearPrivate(s,'guest');
-    const latest=readServiceState();
-    if(latest.principal!==s.principal||latest.scope!==s.scope)return undefined;
-    if(accepted)return keptAccepted();
-    s=shape({...latest,usedSuggestionIds:[...new Set([...s.usedSuggestionIds,...latest.usedSuggestionIds])]});
-    const definitive=businessChatSendRejected(error);
-    return shape({...withLiveDraft(s),usedSuggestionIds:definitive?s.usedSuggestionIds.filter(value=>value!==id):s.usedSuggestionIds,error:safeError(error,'send'),notice:definitive?businessChatCopy('suggestionRejected'):businessChatCopy('suggestionUnconfirmed')});
-   }finally{suggestionFlight=false;}
+   if(suggestion.kind!=='visitor_option'){
+    void deliverButtonSuggestion(id,rows,session).finally(()=>{suggestionFlight=false;});
+    return shape({...s,usedSuggestionIds:[...s.usedSuggestionIds,id],error:'',notice:''});
+   }
+   const ownName=[...s.messages].reverse().find(row=>row.mine&&row.senderName)?.senderName??'';
+   const intent:PendingIntent={...newBusinessChatIntent(suggestion.label,s.roomId,s.principal),suggestionId:id,answerTo:suggestion.messageId,
+    senderName:ownName,...sendAnchor(s.messages,suggestion.label,true),smartChatFromStart:s.transcriptSource==='members'&&s.smartChatEmpty};
+   void deliverSuggestion(intent,rows,s.visitorOptions,session).finally(()=>{suggestionFlight=false;});
+   return shape({...s,usedSuggestionIds:[...s.usedSuggestionIds,id],pendingIntent:intent,
+    messages:[...s.messages,pendingRow(intent)],scrollSend:s.scrollSend+1,error:'',notice:''});
   },
   onEvent:async(s,a)=>{
    if(initFlight){eventDuringInit=true;return undefined;}
@@ -649,7 +704,7 @@ const svc=defineService<State,Record<string,(s:State,a?:unknown)=>State|undefine
    }
    catch(error){if(startEpoch!==epoch)return undefined;const lost=/member_sign_in_required|MemberAccessChanged|\b401\b|\b403\b/i.test(String(error));return lost?clearPrivate(next,'guest'):shape({...withLiveDraft(next),error:safeError(error,'load'),loadFailure:typeof (error as {businessLoadFailure?:unknown})?.businessLoadFailure==='string'?(error as {businessLoadFailure:string}).businessLoadFailure:safeLoadFailure(error)});}
   },
-  dispose:async s=>{epoch++;attachmentUrls.clear();productImages.clear();productImageLookups.clear();serviceIds.clear();serviceIdLookups.clear();currentIdentity=null;businessParticipantId='';await endSubscription();return shape({...initial,phase:'guest'});},
+  dispose:async s=>{epoch++;attachmentUrls.clear();seenSelections.clear();productImages.clear();productImageLookups.clear();serviceIds.clear();serviceIdLookups.clear();currentIdentity=null;businessParticipantId='';await endSubscription();return shape({...initial,phase:'guest'});},
  }
 });
 readServiceState=()=>svc.getState();

package/templates/branded-lite/tier5-src/himi-branded-lite-inbox/index.ts

@@ -0,0 +1,83 @@
+// himi-branded-lite-inbox — the member's Inbox: every conversation the member-role chat list returns, the
+// business's and other members'. Only the member-role list is used (`GET inbox/v2/conversations`, the call the
+// first Inbox made, is an OWNER endpoint that answers a member with 404). A failed query is an error with Retry
+// (or Sign in for a visitor) and an empty one is a real empty state — never sample rows presented as the
+// customer's own. Samples appear only in the host's explicit sample preview (_shared/branded-load-state.ts).
+import { defineService } from "../_shared/collection-service.js";
+import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
+import { getChatToken, listChatroomsPage } from "@himalaya/wix-chat-web";
+import { assertMemberAccess, memberAccess } from "../_shared/member-access.js";
+import { inboxRows, type InboxRow } from "../_shared/inbox-rooms.js";
+import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+
+type Row = Omit<InboxRow, "at">;
+interface S extends LoadFlags {
+  conversations: Row[]; emptyText: string;
+  isMock: boolean; notMock: boolean; /** #2849 — hiddenWhen() hides on TRUE, so these are inverted: the empty-state banner
+   *  shows only when the site really has none, and the unavailable one only when the query failed. A failed
+   *  query must never render the sentence that claims the customer has no conversations. */
+  notMockEmpty: boolean; notMockUnavailable: boolean;
+}
+
+const MEMBER = { role: "member" } as const;
+const PAGE_SIZE = 50;
+// 2000 conversations: far beyond a real member. The cap only stops a runaway cursor from looping, and reaching it is an
+// error, never a quietly shorter list.
+const MAX_PAGES = 40;
+
+const MOCK: Row[] = [
+  { id: "sample-support", title: "Support", subtitle: "Hi! Let us know how we can help.", screenId: "himi_business_chat", kind: "", photo: "", initial: "S", unread: false, unreadDot: "" },
+  { id: "sample-member", title: "A member", subtitle: "Welcome 👋 Thanks for joining us!", screenId: "himi_chat_thread", kind: "chatroom", photo: "", initial: "A", unread: false, unreadDot: "" },
+];
+
+/** Sample rows reach the screen ONLY in the host's explicit sample preview; a failed or empty query is an
+ *  honest error / empty state (branded-load-state.ts). */
+const COPY: LoadCopy<Row> = {
+  prefix: "inbox",
+  empty: "No messages yet.",
+  error: "Your messages couldn't be loaded.",
+  signIn: "Sign in to see your messages.",
+  sample: () => MOCK.map((r) => ({ ...r })),
+};
+
+const signInRequired = () => new Error("Unauthenticated: sign in to see your messages");
+
+async function listAllRooms(): Promise<unknown[]> {
+  // One token for every page; a refused one fails the whole load rather than showing half a list.
+  const { chatToken } = await getChatToken(MEMBER);
+  const rooms: unknown[] = [];
+  let nextPointer: number | string | undefined;
+  for (let page = 0; page < MAX_PAGES; page++) {
+    const result = await listChatroomsPage({ ...MEMBER, chatToken, pageSize: PAGE_SIZE, ...(nextPointer !== undefined ? { nextPointer } : {}) });
+    rooms.push(...result.items);
+    nextPointer = result.nextPointer;
+    if (nextPointer === undefined) return rooms;
+  }
+  throw new Error("Conversation list is longer than the pages read");
+}
+
+const svc = defineService<S, { load: (s: S, arg?: unknown) => Promise<S> }>("himiBrandedInbox", {
+  state: { ...LOADING, conversations: [], emptyText: "" },
+  actions: {
+    load: async (s, arg) => {
+      // The screen's onAppear carries the copy pack (Hebrew, an owner's wording). This service is not a collection, so
+      // nothing else stashes it; a retry sends no params and keeps the pack already stashed.
+      stashCopy(arg);
+      try {
+        const member = await memberAccess();
+        if (!member.email) throw signInRequired();
+        const rows = inboxRows(await listAllRooms(), copyParam("inbox.conversationFallback", "Conversation")).map(({ at: _at, ...row }) => row);
+        // A sign-out or account switch while the list loaded must not paint the previous member's rooms.
+        await assertMemberAccess(member);
+        return { ...s, ...loaded("conversations", rows, COPY) };
+      } catch (err) {
+        const failed = loadFailed("conversations", (await memberAccess()).email ? err : signInRequired(), COPY);
+        // The failure sentence is the screen banner's stock key, not a second key for the same English (the extractor
+        // keeps one key per extracted row); loadFailed would read `inbox.errorText`, which does not exist.
+        return { ...s, ...failed, ...(failed.signInRequired ? {} : { error: copyParam("inbox.unavailableBody", COPY.error) }) };
+      }
+    },
+  },
+});
+svc.load();
+export { svc };

package/templates/branded-lite/tier5-src/himi-branded-lite-notifications/index.ts

@@ -10,6 +10,10 @@ import { defineService as registerService } from "../_shared/collection-service.
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
 import { queryNotifications, markRead, markAllRead, type MfvNotification } from "@himalaya/wix-members-feed-viewer";
 import { assertMemberAccess, memberAccess, type MemberAccess } from "../_shared/member-access.js";
+import { navigate } from "@himalaya/state";
+import { notificationOpen, urlHost, type NotificationOpen } from "../_shared/notification-target.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { copyParam, copyTemplate } from "../_shared/himi-copy.js";
 
 interface Row {
   id: string;
@@ -22,9 +26,13 @@ interface Row {
   photo: string;
   initial: string;
   dest: string;
+  /** What a tap does (a screen, a web link or nothing). Absent on the preview samples, which open nothing. */
+  open?: NotificationOpen;
 }
 interface S extends LoadFlags {
   items: Row[]; emptyText: string; actionMessage: string;
+  /** The web link the last tap named and is waiting for a second tap to open (see `open`). */
+  pendingUrl: string;
   /** Ownership travels with the rows, including a state captured by an async write. */
   inboxMember: MemberAccess | null;
   isMock: boolean; notMock: boolean;
@@ -67,7 +75,17 @@ function photo(n: MfvNotification): string {
   return n.icon?.personAvatarData?.data || n.icon?.webUrlData?.webUrl || "";
 }
 
-function norm(n: MfvNotification): Row {
+/** The screens the Notifications screen says its app serves, or undefined when it did not say. */
+function servedScreens(arg: unknown): ReadonlySet<string> | undefined {
+  const served = (arg as { served?: unknown } | null | undefined)?.served;
+  // A Retry reaches `load` with no params (the collection layer re-dispatches the action bare), so the list the screen
+  // last named is kept: dropping it would let every catalog link be tried again.
+  if (typeof served === "string") lastServed = new Set(served.split(",").filter(Boolean));
+  return lastServed;
+}
+let lastServed: ReadonlySet<string> | undefined;
+
+function norm(n: MfvNotification, served?: ReadonlySet<string>): Row {
   const name = (n.title || n.message || "Notification").trim() || "Notification";
   const rel = relativeTime(n.sentDate);
   const lead = n.title && n.message ? n.message.trim() : "";
@@ -83,6 +101,7 @@ function norm(n: MfvNotification): Row {
     photo: p,
     initial: (name[0] || "#").toUpperCase(),
     dest: dest(n),
+    open: notificationOpen(n.deeplink, served),
   };
 }
 
@@ -128,12 +147,13 @@ function currentInbox(s: S): S | undefined {
 }
 
 const defineService = withOnlineWrites(registerService, ["markOneRead","markAll"], { messageFields: ["actionMessage"] });
-const INITIAL = { ...LOADING, items: [] as Row[], emptyText: "", actionMessage: "", inboxMember: null };
+const INITIAL = { ...LOADING, items: [] as Row[], emptyText: "", actionMessage: "", pendingUrl: "", inboxMember: null };
 const svc = defineService<S, {
   prepare: (s: S) => S;
-  load: (s: S) => Promise<S>;
+  load: (s: S, arg?: unknown) => Promise<S>;
   markOneRead: (s: S, id: string) => Promise<S | undefined>;
   markAll: (s: S) => Promise<S | undefined>;
+  open: (s: S, arg?: unknown) => Promise<S | undefined>;
 }>("himiBrandedNotifications", {
   state: INITIAL,
   actions: {
@@ -141,14 +161,16 @@ const svc = defineService<S, {
     // Native hosts may already cold-paint their account-scoped snapshot; this
     // reducer does not control that earlier host phase.
     prepare: (s) => ({ ...s, ...INITIAL }),
-    load: async (s) => {
+    load: async (s, arg) => {
+      // The screen names which of the link targets this app serves (a comma list); none given means any may be tried.
+      const served = servedScreens(arg);
       try {
         const member = await requireMember();
-        const items = (await queryNotifications(25)).map(norm);
+        const items = (await queryNotifications(25)).map((n) => norm(n, served));
         await assertMemberAccess(member);
-        return { ...s, ...loaded("items", items, COPY), inboxMember: member, actionMessage: "" };
+        return { ...s, ...loaded("items", items, COPY), inboxMember: member, actionMessage: "", pendingUrl: "" };
       } catch (err) {
-        return { ...s, ...loadFailed("items", (await memberAccess()).email ? err : signInRequired(), COPY), inboxMember: null };
+        return { ...s, ...loadFailed("items", (await memberAccess()).email ? err : signInRequired(), COPY), inboxMember: null, actionMessage: "", pendingUrl: "" };
       }
     },
     // Mark one read; optimistically clear its dot. Real write is best-effort and
@@ -174,6 +196,39 @@ const svc = defineService<S, {
       const current = currentInbox(s);
       return current ? { ...current, items: current.items.map((r) => (r.id === id ? { ...r, unread: false, unreadDot: "" } : r)) } : undefined;
     },
+    // A tap on a row opens what the notification points at, like the One App: a Himi screen when its link names
+    // one of ours (see _shared/notification-target.ts), else its https link, else a visible "can't open".
+    // A web link is written by the site, so it needs a SECOND tap on the same row, after the first tap has
+    // shown where it goes. It never replaces the inbox, and an unknown link never guesses a screen.
+    open: async (s, arg): Promise<S | undefined> => {
+      const id = String((arg as { id?: unknown } | null | undefined)?.id ?? "");
+      const row = s.items.find((r) => r.id === id);
+      if (!row || s.busy) return undefined;
+      if (!s.isMock) {
+        try { await requireInboxMember(s); } catch (err) {
+          const current = currentInbox(s);
+          return current ? { ...current, ...loadFailed("items", err, COPY), inboxMember: null } : undefined;
+        }
+      }
+      const current = currentInbox(s);
+      if (!current) return undefined;
+      const action = row.open ?? { kind: "none" as const };
+      if (action.kind === "url") {
+        if (current.pendingUrl !== action.url) {
+          return { ...current, pendingUrl: action.url, actionMessage: copyTemplate("notifications.openLinkText", "Tap again to open {host}.", { host: urlHost(action.url) }) };
+        }
+        const opened = await openRichLink(action.url);
+        const now = currentInbox(s);
+        return now ? { ...now, pendingUrl: "", actionMessage: opened ? "" : copyParam("notifications.cantOpenText", "This notification can't be opened here.") } : undefined;
+      }
+      if (action.kind === "none") {
+        return { ...current, pendingUrl: "", actionMessage: copyParam("notifications.cantOpenText", "This notification can't be opened here.") };
+      }
+      // Read on open: the dot clears at once, the write is best effort and never holds the navigation.
+      if (!id.startsWith("sample-") && row.unread) markRead([id]).catch(() => undefined);
+      const read = { ...current, pendingUrl: "", actionMessage: "", items: current.items.map((r) => (r.id === id ? { ...r, unread: false, unreadDot: "" } : r)) };
+      return navigate(read, { screenId: action.target.screenId, args: action.target.args });
+    },
     // Mark everything read; optimistically clear all dots.
     markAll: async (s): Promise<S | undefined> => {
       if (s.busy) return undefined;