@rimori/react-client 0.4.18-next.0 → 0.4.18-next.1

package/dist/components/ai/Avatar.js

@@ -9,7 +9,7 @@ import { getFirstMessages } from './utils';
 import { useTheme } from '../../hooks/ThemeSetter';
 export function Avatar({ avatarImageUrl, voiceId, agentTools, autoStartConversation, children, circleSize = '300px', className, cache = false, prompt, promptVariables, }) {
     const { ai, event, plugin, userInfo } = useRimori();
-    const { isDark: isDarkThemeValue } = useTheme(plugin.theme);
+    const { isDark: isDarkThemeValue } = useTheme(plugin.theme, true);
     const [agentReplying, setAgentReplying] = useState(false);
     const [isProcessingMessage, setIsProcessingMessage] = useState(false);
     const dialectTtsInstruction = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.dialect)

package/dist/components/ai/BuddyAssistant.js

@@ -11,7 +11,7 @@ const genId = () => `ba-${++idCounter}`;
 export function BuddyAssistant({ prompt, promptVariables, autoStartConversation, circleSize = '160px', chatPlaceholder, bottomAction, className, voiceSpeed = 1, tools, showName = false, }) {
     const { ai, event, plugin, userInfo } = useRimori();
     const ttsEnabled = plugin.ttsEnabled;
-    const { isDark } = useTheme(plugin.theme);
+    const { isDark } = useTheme(plugin.theme, true);
     const buddy = userInfo.study_buddy;
     const dialect = userInfo === null || userInfo === void 0 ? void 0 : userInfo.dialect;
     const dialectTtsInstruction = dialect ? `Speak with a ${dialect} accent and pronunciation.` : undefined;
@@ -99,7 +99,7 @@ export function BuddyAssistant({ prompt, promptVariables, autoStartConversation,
         triggerAI(newMessages);
     };
     const lastAssistantMessage = [...messages].filter((m) => m.role === 'assistant').pop();
-    return (_jsxs("div", { className: `flex flex-col items-center ${className || ''}`, children: [_jsx(CircleAudioAvatar, { width: circleSize, imageUrl: buddy.avatarUrl, isDarkTheme: isDark, className: "mx-auto" }), showName && (_jsx("div", { className: "flex items-center gap-2", children: _jsx("span", { className: "text-3xl font-semibold", children: buddy.name }) })), !ttsEnabled ? (_jsx("div", { className: "w-full rounded-xl bg-gray-200/70 dark:bg-gray-800/70 px-4 py-3 text-sm text-gray-800 dark:text-gray-200 leading-relaxed border border-gray-300/40 dark:border-gray-700/40 mt-4", children: !(lastAssistantMessage === null || lastAssistantMessage === void 0 ? void 0 : lastAssistantMessage.content) && isLoading ? (_jsxs("span", { className: "inline-flex gap-1 py-0.5", children: [_jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce" }), _jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce", style: { animationDelay: '0.15s' } }), _jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce", style: { animationDelay: '0.3s' } })] })) : (_jsx("span", { className: "whitespace-pre-wrap", children: lastAssistantMessage === null || lastAssistantMessage === void 0 ? void 0 : lastAssistantMessage.content })) })) : null, _jsxs("div", { className: 'w-full relative mt-4 ' + (ttsEnabled ? 'max-w-md' : ''), children: [_jsx("input", { value: chatInput, onChange: (e) => setChatInput(e.target.value), onKeyDown: (e) => {
+    return (_jsxs("div", { className: `flex flex-col items-center ${className || ''}`, children: [_jsx(CircleAudioAvatar, { width: circleSize, imageUrl: buddy.avatarUrl, isDarkTheme: isDark, className: "mx-auto" }), showName && (_jsx("div", { className: "flex items-center gap-2", children: _jsx("span", { className: "text-3xl font-semibold", children: buddy.name }) })), !plugin.ttsEnabled && messages.length > 1 ? (_jsx("div", { className: "w-full rounded-xl bg-gray-200/70 dark:bg-gray-800/70 px-4 py-3 text-sm text-gray-800 dark:text-gray-200 leading-relaxed border border-gray-300/40 dark:border-gray-700/40 mt-4", children: !(lastAssistantMessage === null || lastAssistantMessage === void 0 ? void 0 : lastAssistantMessage.content) && isLoading ? (_jsxs("span", { className: "inline-flex gap-1 py-0.5", children: [_jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce" }), _jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce", style: { animationDelay: '0.15s' } }), _jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-gray-400 animate-bounce", style: { animationDelay: '0.3s' } })] })) : (_jsx("span", { className: "whitespace-pre-wrap", children: lastAssistantMessage === null || lastAssistantMessage === void 0 ? void 0 : lastAssistantMessage.content })) })) : null, _jsxs("div", { className: 'w-full relative mt-4 ' + (ttsEnabled ? 'max-w-md' : ''), children: [_jsx("input", { value: chatInput, onChange: (e) => setChatInput(e.target.value), onKeyDown: (e) => {
                             if (e.key === 'Enter' && !e.shiftKey) {
                                 e.preventDefault();
                                 sendMessage(chatInput);

package/dist/providers/PluginProvider.d.ts

@@ -4,14 +4,12 @@ import type { UserInfo } from '@rimori/client';
 interface PluginProviderProps {
     children: ReactNode;
     pluginId: string;
+    /** Pre-constructed RimoriClient (federation mode). When provided, skips the handshake entirely. */
+    client?: RimoriClient;
+    /** Pre-loaded user info (federation mode). Required when client is provided. */
+    userInfo?: UserInfo;
     settings?: {
         disableContextMenu?: boolean;
-        disableThemeSetting?: boolean;
-        /**
-         * Skip the scrollbar detection that emits 'session.triggerScrollbarChange'.
-         * In federation mode, the host (FederatedPluginRenderer) handles this instead.
-         */
-        disableScrollbarDetection?: boolean;
     };
 }
 export declare const PluginProvider: React.FC<PluginProviderProps>;

package/dist/providers/PluginProvider.js

@@ -14,13 +14,14 @@ import posthog from 'posthog-js';
 import ContextMenu from '../components/ContextMenu';
 import { useTheme } from '../hooks/ThemeSetter';
 const PluginContext = createContext(null);
-export const PluginProvider = ({ children, pluginId, settings }) => {
-    const [client, setClient] = useState(null);
+export const PluginProvider = ({ children, pluginId, client: injectedClient, userInfo: injectedUserInfo, settings, }) => {
+    const isFederated = !!injectedClient;
+    const [client, setClient] = useState(injectedClient !== null && injectedClient !== void 0 ? injectedClient : null);
     const [standaloneClient, setStandaloneClient] = useState(false);
     const [applicationMode, setApplicationMode] = useState(null);
     const [theme, setTheme] = useState(undefined);
-    const [userInfo, setUserInfo] = useState(null);
-    useTheme(theme, settings === null || settings === void 0 ? void 0 : settings.disableThemeSetting);
+    const [userInfo, setUserInfo] = useState(injectedUserInfo !== null && injectedUserInfo !== void 0 ? injectedUserInfo : null);
+    useTheme(theme, isFederated);
     // Init PostHog once per plugin iframe
     useEffect(() => {
         if (!posthog.__loaded) {
@@ -40,6 +41,9 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
     const isSidebar = applicationMode === 'sidebar';
     const isSettings = applicationMode === 'settings';
     useEffect(() => {
+        // In federation mode the client is already ready — skip handshake
+        if (isFederated)
+            return;
         initEventBus(pluginId);
         // Check if we're in an iframe context - if not, we're standalone
         const standaloneDetected = window === window.parent;
@@ -51,7 +55,6 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
         if ((!standaloneDetected && !client) || (standaloneDetected && standaloneClient === true)) {
             void RimoriClient.getInstance(pluginId).then((client) => {
                 setClient(client);
-                // Set initial userInfo
                 setUserInfo(client.plugin.getUserInfo());
                 // Get applicationMode and theme from MessageChannel query params
                 if (!standaloneDetected) {
@@ -61,7 +64,7 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
                 }
             });
         }
-    }, [pluginId, standaloneClient, client]);
+    }, [pluginId, standaloneClient, client, isFederated]);
     // Identify user in PostHog when userInfo is available
     useEffect(() => {
         if (userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_id) {
@@ -73,7 +76,7 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
         if (!client)
             return;
         const unsubscribe = client.plugin.onRimoriInfoUpdate((info) => {
-            console.log('[PluginProvider] Received RimoriInfo update, updating userInfo');
+            // console.log('[PluginProvider] Received RimoriInfo update, updating userInfo + ttsEnabled:', info.ttsEnabled);
             setUserInfo(info.profile);
         });
         return () => unsubscribe();
@@ -83,6 +86,8 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
             return;
         if (isSidebar)
             return; //sidebar pages should not report url changes
+        if (isFederated)
+            return; // federation mode: host handles URL sync
         // react router overwrites native pushstate so it gets wrapped to detect url changes
         const originalPushState = history.pushState;
         history.pushState = (...args) => {
@@ -90,11 +95,11 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
             client.event.emit('session.triggerUrlChange', { url: location.hash });
             return result;
         };
-    }, [client, isSidebar]);
+    }, [client, isSidebar, isFederated]);
     useEffect(() => {
         if (!client)
             return;
-        if (settings === null || settings === void 0 ? void 0 : settings.disableScrollbarDetection)
+        if (isFederated)
             return;
         const checkScrollbar = () => {
             const hasScrollbar = document.documentElement.scrollHeight > window.innerHeight;
@@ -111,7 +116,7 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
             window.removeEventListener('resize', checkScrollbar);
             resizeObserver.disconnect();
         };
-    }, [client, settings === null || settings === void 0 ? void 0 : settings.disableScrollbarDetection]);
+    }, [client, isFederated]);
     if (standaloneClient instanceof StandaloneClient) {
         return (_jsx(StandaloneAuth, { onLogin: (email, password) => __awaiter(void 0, void 0, void 0, function* () {
                 if (yield standaloneClient.login(email, password))
@@ -128,9 +133,9 @@ export const useRimori = () => {
     if (context === null) {
         throw new Error('useRimori must be used within an PluginProvider');
     }
-    // Return client with userInfo at root level for easy access
-    // Maintains backwards compatibility - all client properties are still accessible
-    return Object.assign(context.client, { userInfo: context.userInfo });
+    return Object.assign(context.client, {
+        userInfo: context.userInfo,
+    });
 };
 function getUrlParam(name) {
     // First try to get from URL hash query params (for compatibility)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimori/react-client",
-  "version": "0.4.18-next.0",
+  "version": "0.4.18-next.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "format": "prettier --write ."
   },
   "peerDependencies": {
-    "@rimori/client": "^2.5.29",
+    "@rimori/client": "2.5.29-next.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0"
   },
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.37.0",
-    "@rimori/client": "^2.5.29",
+    "@rimori/client": "2.5.29-next.1",
     "@types/react": "^18.3.21",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",

package/src/components/ai/Avatar.tsx

@@ -37,7 +37,7 @@ export function Avatar({
   promptVariables,
 }: Props) {
   const { ai, event, plugin, userInfo } = useRimori();
-  const { isDark: isDarkThemeValue } = useTheme(plugin.theme);
+  const { isDark: isDarkThemeValue } = useTheme(plugin.theme, true);
   const [agentReplying, setAgentReplying] = useState(false);
   const [isProcessingMessage, setIsProcessingMessage] = useState(false);
   const dialectTtsInstruction = userInfo?.dialect

package/src/components/ai/BuddyAssistant.tsx

@@ -48,7 +48,7 @@ export function BuddyAssistant({
 }: BuddyAssistantProps): JSX.Element {
   const { ai, event, plugin, userInfo } = useRimori();
   const ttsEnabled = plugin.ttsEnabled;
-  const { isDark } = useTheme(plugin.theme);
+  const { isDark } = useTheme(plugin.theme, true);
   const buddy = userInfo.study_buddy;
   const dialect = userInfo?.dialect;
   const dialectTtsInstruction = dialect ? `Speak with a ${dialect} accent and pronunciation.` : undefined;
@@ -158,7 +158,7 @@ export function BuddyAssistant({
         </div>
       )}
 
-      {!ttsEnabled ? (
+      {!plugin.ttsEnabled && messages.length > 1 ? (
         <div className="w-full rounded-xl bg-gray-200/70 dark:bg-gray-800/70 px-4 py-3 text-sm text-gray-800 dark:text-gray-200 leading-relaxed border border-gray-300/40 dark:border-gray-700/40 mt-4">
           {!lastAssistantMessage?.content && isLoading ? (
             <span className="inline-flex gap-1 py-0.5">

package/src/providers/PluginProvider.tsx

@@ -9,14 +9,12 @@ import { Theme } from '@rimori/client';
 interface PluginProviderProps {
   children: ReactNode;
   pluginId: string;
+  /** Pre-constructed RimoriClient (federation mode). When provided, skips the handshake entirely. */
+  client?: RimoriClient;
+  /** Pre-loaded user info (federation mode). Required when client is provided. */
+  userInfo?: UserInfo;
   settings?: {
     disableContextMenu?: boolean;
-    disableThemeSetting?: boolean;
-    /**
-     * Skip the scrollbar detection that emits 'session.triggerScrollbarChange'.
-     * In federation mode, the host (FederatedPluginRenderer) handles this instead.
-     */
-    disableScrollbarDetection?: boolean;
   };
 }
 
@@ -27,14 +25,21 @@ interface PluginContextValue {
 
 const PluginContext = createContext<PluginContextValue | null>(null);
 
-export const PluginProvider: React.FC<PluginProviderProps> = ({ children, pluginId, settings }) => {
-  const [client, setClient] = useState<RimoriClient | null>(null);
+export const PluginProvider: React.FC<PluginProviderProps> = ({
+  children,
+  pluginId,
+  client: injectedClient,
+  userInfo: injectedUserInfo,
+  settings,
+}) => {
+  const isFederated = !!injectedClient;
+  const [client, setClient] = useState<RimoriClient | null>(injectedClient ?? null);
   const [standaloneClient, setStandaloneClient] = useState<StandaloneClient | boolean>(false);
   const [applicationMode, setApplicationMode] = useState<string | null>(null);
   const [theme, setTheme] = useState<Theme | undefined>(undefined);
-  const [userInfo, setUserInfo] = useState<UserInfo | null>(null);
+  const [userInfo, setUserInfo] = useState<UserInfo | null>(injectedUserInfo ?? null);
 
-  useTheme(theme, settings?.disableThemeSetting);
+  useTheme(theme, isFederated);
 
   // Init PostHog once per plugin iframe
   useEffect(() => {
@@ -57,6 +62,9 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
   const isSettings = applicationMode === 'settings';
 
   useEffect(() => {
+    // In federation mode the client is already ready — skip handshake
+    if (isFederated) return;
+
     initEventBus(pluginId);
 
     // Check if we're in an iframe context - if not, we're standalone
@@ -71,7 +79,6 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     if ((!standaloneDetected && !client) || (standaloneDetected && standaloneClient === true)) {
       void RimoriClient.getInstance(pluginId).then((client) => {
         setClient(client);
-        // Set initial userInfo
         setUserInfo(client.plugin.getUserInfo());
 
         // Get applicationMode and theme from MessageChannel query params
@@ -82,7 +89,7 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
         }
       });
     }
-  }, [pluginId, standaloneClient, client]);
+  }, [pluginId, standaloneClient, client, isFederated]);
 
   // Identify user in PostHog when userInfo is available
   useEffect(() => {
@@ -96,7 +103,7 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     if (!client) return;
 
     const unsubscribe = client.plugin.onRimoriInfoUpdate((info) => {
-      console.log('[PluginProvider] Received RimoriInfo update, updating userInfo');
+      // console.log('[PluginProvider] Received RimoriInfo update, updating userInfo + ttsEnabled:', info.ttsEnabled);
       setUserInfo(info.profile);
     });
 
@@ -106,6 +113,7 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
   useEffect(() => {
     if (!client) return;
     if (isSidebar) return; //sidebar pages should not report url changes
+    if (isFederated) return; // federation mode: host handles URL sync
 
     // react router overwrites native pushstate so it gets wrapped to detect url changes
     const originalPushState = history.pushState;
@@ -114,11 +122,11 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
       client.event.emit('session.triggerUrlChange', { url: location.hash });
       return result;
     };
-  }, [client, isSidebar]);
+  }, [client, isSidebar, isFederated]);
 
   useEffect(() => {
     if (!client) return;
-    if (settings?.disableScrollbarDetection) return;
+    if (isFederated) return;
 
     const checkScrollbar = (): void => {
       const hasScrollbar = document.documentElement.scrollHeight > window.innerHeight;
@@ -140,7 +148,7 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
       window.removeEventListener('resize', checkScrollbar);
       resizeObserver.disconnect();
     };
-  }, [client, settings?.disableScrollbarDetection]);
+  }, [client, isFederated]);
 
   if (standaloneClient instanceof StandaloneClient) {
     return (
@@ -169,9 +177,9 @@ export const useRimori = (): RimoriClient & { userInfo: UserInfo } => {
   if (context === null) {
     throw new Error('useRimori must be used within an PluginProvider');
   }
-  // Return client with userInfo at root level for easy access
-  // Maintains backwards compatibility - all client properties are still accessible
-  return Object.assign(context.client, { userInfo: context.userInfo }) as RimoriClient & { userInfo: UserInfo };
+  return Object.assign(context.client, {
+    userInfo: context.userInfo,
+  }) as RimoriClient & { userInfo: UserInfo };
 };
 
 function getUrlParam(name: string): string | null {