[Odie] Send site_id and scroll to the beggining of the message.

packages/help-center/src/components/help-center-content.tsx

@@ -10,7 +10,7 @@ import { useEffect, useRef } from '@wordpress/element';
 import { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
-import { getSectionName } from 'calypso/state/ui/selectors';
+import { getSectionName, getSelectedSiteId } from 'calypso/state/ui/selectors';
 /**
  * Internal Dependencies
  */
@@ -39,6 +39,7 @@ const HelpCenterContent: React.FC< { isRelative?: boolean; currentRoute?: string
 			isMinimized: store.getIsMinimized(),
 		};
 	}, [] );
+	const selectedSiteId = useSelector( getSelectedSiteId );
 
 	useEffect( () => {
 		recordTracksEvent( 'calypso_helpcenter_page_open', {
@@ -105,6 +106,7 @@ const HelpCenterContent: React.FC< { isRelative?: boolean; currentRoute?: string
 							initialUserMessage={ searchTerm }
 							logger={ trackEvent }
 							loggerEventNamePrefix="calypso_odie"
+							selectedSiteId={ selectedSiteId }
 							extraContactOptions={
 								<HelpCenterContactPage
 									hideHeaders

packages/odie-client/src/context/index.tsx

@@ -34,6 +34,7 @@ type OdieAssistantContextInterface = {
 	lastNudge: Nudge | null;
 	odieClientId: string;
 	sendNudge: ( nudge: Nudge ) => void;
+	selectedSiteId?: number | null;
 	setChat: ( chat: Chat ) => void;
 	setIsLoadingChat: ( isLoadingChat: boolean ) => void;
 	setMessageLikedStatus: ( message: Message, liked: boolean ) => void;
@@ -92,6 +93,7 @@ type OdieAssistantProviderProps = {
 	extraContactOptions?: ReactNode;
 	logger?: ( message: string, properties: Record< string, unknown > ) => void;
 	loggerEventNamePrefix?: string;
+	selectedSiteId?: number | null;
 	version?: string | null;
 	children?: ReactNode;
 } & PropsWithChildren;
@@ -105,6 +107,7 @@ const OdieAssistantProvider: FC< OdieAssistantProviderProps > = ( {
 	enabled = true,
 	logger,
 	loggerEventNamePrefix,
+	selectedSiteId,
 	version = null,
 	children,
 } ) => {
@@ -227,6 +230,7 @@ const OdieAssistantProvider: FC< OdieAssistantProviderProps > = ( {
 				isVisible,
 				lastNudge,
 				odieClientId,
+				selectedSiteId,
 				sendNudge: setLastNudge,
 				setChat,
 				setIsLoadingChat: noop,

packages/odie-client/src/index.tsx

@@ -30,8 +30,8 @@ export const OdieAssistant: React.FC = () => {
 					if ( lastMessageElement?.target ) {
 						lastMessageElement.target.scrollIntoView( {
 							behavior: 'auto',
-							block: 'end',
-							inline: 'end',
+							block: 'start',
+							inline: 'nearest',
 						} );
 					}
 				} );

packages/odie-client/src/query/index.ts

@@ -14,7 +14,8 @@ const buildSendChatMessage = async (
 	message: Message,
 	botNameSlug: OdieAllowedBots,
 	chat_id?: number | null,
-	version?: string | null
+	version?: string | null,
+	selectedSiteId?: number | null
 ) => {
 	const baseApiPath = '/help-center/odie/chat/';
 	const wpcomBaseApiPath = '/odie/chat/';
@@ -30,19 +31,24 @@ const buildSendChatMessage = async (
 			: `${ wpcomBaseApiPath }${ botNameSlug }`;
 
 	return canAccessWpcomApis()
-		? odieWpcomSendSupportMessage( message, wpcomApiPathWithIds, version )
+		? odieWpcomSendSupportMessage( message, wpcomApiPathWithIds, version, selectedSiteId )
 		: apiFetch( {
 				path: apiPathWithIds,
 				method: 'POST',
-				data: { message, version },
+				data: { message, version, context: { selectedSiteId } },
 		  } );
 };
 
-function odieWpcomSendSupportMessage( message: Message, path: string, version?: string | null ) {
+function odieWpcomSendSupportMessage(
+	message: Message,
+	path: string,
+	version?: string | null,
+	selectedSiteId?: number | null
+) {
 	return wpcom.req.post( {
 		path,
 		apiNamespace: 'wpcom/v2',
-		body: { message: message.content, version },
+		body: { message: message.content, version, context: { selectedSiteId } },
 	} );
 }
 
@@ -70,8 +76,16 @@ export const useOdieSendMessage = (): UseMutationResult<
 	{ message: Message },
 	{ internal_message_id: string }
 > => {
-	const { chat, botNameSlug, setIsLoading, addMessage, updateMessage, odieClientId, version } =
-		useOdieAssistantContext();
+	const {
+		chat,
+		botNameSlug,
+		setIsLoading,
+		addMessage,
+		updateMessage,
+		odieClientId,
+		selectedSiteId,
+		version,
+	} = useOdieAssistantContext();
 	const queryClient = useQueryClient();
 	const userMessage = useRef< Message | null >( null );
 
@@ -83,7 +97,13 @@ export const useOdieSendMessage = (): UseMutationResult<
 	>( {
 		mutationFn: ( { message }: { message: Message } ) => {
 			broadcastOdieMessage( message, odieClientId );
-			return buildSendChatMessage( { ...message }, botNameSlug, chat.chat_id, version );
+			return buildSendChatMessage(
+				{ ...message },
+				botNameSlug,
+				chat.chat_id,
+				version,
+				selectedSiteId
+			);
 		},
 		onMutate: ( { message } ) => {
 			const internal_message_id = uuid();