SmythOS Studio: Open-Source Visual AI Agent Builder and deployable runtime stack from SmythOS. Start with an intuitive drag-and-drop workspace, extend with custom code, and deploy your agents anywhere — local, cloud, or edge — with full governance and control.
JavaScript a2aagentic-aiai-agentsdevtoolsmcp-clientn8n-alternativeno-codeopen-sourceorchestrationsmythosvisual-builder
Refactor Chat Context and Header for Model Override Consistency
Salman-Ahamed494afd7fc8f1
diff --git a/packages/app/src/react/features/ai-chat/components/header.tsx b/packages/app/src/react/features/ai-chat/components/header.tsxindex 9799ac31..3f4123b1 100644--- a/packages/app/src/react/features/ai-chat/components/header.tsx+++ b/packages/app/src/react/features/ai-chat/components/header.tsx@@ -74,7 +74,7 @@ export const ChatHeader: FC<ChatHeaderProps> = (props) => {const avatar = agentSettings?.avatar;const selectedModel = agentSettings?.chatGptModel;- const { clearChatSession, selectedModelOverride, setSelectedModelOverride } = useChatContext();+ const { clearChatSession, modelOverride, setModelOverride } = useChatContext();// Fetch model agents to check if current agent is a model agentconst { data: modelAgents } = useQuery<ModelAgent[]>({@@ -86,7 +86,7 @@ export const ChatHeader: FC<ChatHeaderProps> = (props) => {const isModelAgent = modelAgents?.some((modelAgent) => modelAgent.id === agent?.id) ?? false;// Use override if set, otherwise use agent's default model- const currentModel = selectedModelOverride || selectedModel || '';+ const currentModel = modelOverride || selectedModel || '';// State for LLM modelsconst [llmModels, setLlmModels] = useState<Array<ILLMModels>>([]);@@ -145,7 +145,7 @@ export const ChatHeader: FC<ChatHeaderProps> = (props) => {const handleModelChange = useCallback((newModel: string) => {// Set temporary model override (not saved to agent config)- setSelectedModelOverride(newModel);+ setModelOverride(newModel);// Close dropdown after selectionsetIsDropdownOpen(false);@@ -155,7 +155,7 @@ export const ChatHeader: FC<ChatHeaderProps> = (props) => {model: newModel,});},- [setSelectedModelOverride],+ [setModelOverride],);/**diff --git a/packages/app/src/react/features/ai-chat/contexts/chat-context.tsx b/packages/app/src/react/features/ai-chat/contexts/chat-context.tsxindex 59e878de..27e67b44 100644--- a/packages/app/src/react/features/ai-chat/contexts/chat-context.tsx+++ b/packages/app/src/react/features/ai-chat/contexts/chat-context.tsx@@ -1,6 +1,6 @@/* eslint-disable no-unused-vars */import { ChatInputRef } from '@react/features/ai-chat/components/input';-import { IMessageFile } from '@react/features/ai-chat/types/chat.types';+import { IChatMessage, IMessageFile } from '@react/features/ai-chat/types/chat.types';import { AgentDetails, AgentSettings } from '@react/shared/types/agent-data.types';import { createContext, MutableRefObject } from 'react';@@ -14,6 +14,21 @@ export interface IChatContext {addFiles: (newFiles: File[]) => Promise<void>;removeFile: (index: number) => Promise<void>;};+ chat: {+ // State+ messages: IChatMessage[];+ isStreaming: boolean;+ isProcessing: boolean;++ // Actions+ sendMessage: (message: string, files?: File[] | IMessageFile[]) => Promise<void>;+ retryMessage: () => Promise<void>;+ stopGenerating: () => void;+ clearMessages: () => void;+ };+ // Model override (temporary, not saved to agent config)+ modelOverride: string | null;+ setModelOverride: (model: string | null) => void;}export const ChatContext = createContext<IChatContext>({@@ -26,4 +41,15 @@ export const ChatContext = createContext<IChatContext>({addFiles: async () => {},removeFile: async () => {},},+ chat: {+ messages: [],+ isStreaming: false,+ isProcessing: false,+ sendMessage: async () => {},+ retryMessage: async () => {},+ stopGenerating: () => {},+ clearMessages: () => {},+ },+ modelOverride: null,+ setModelOverride: () => {},});diff --git a/packages/app/src/react/features/ai-chat/contexts/index.new.tsx b/packages/app/src/react/features/ai-chat/contexts/index.new.tsxindex 93e12ddb..0004b53d 100644--- a/packages/app/src/react/features/ai-chat/contexts/index.new.tsx+++ b/packages/app/src/react/features/ai-chat/contexts/index.new.tsx@@ -1,10 +1,11 @@import { ChatInputRef } from '@react/features/ai-chat/components/input';import { ChatContext, IChatContext } from '@react/features/ai-chat/contexts/chat-context';import { useAgent } from '@src/react/shared/hooks/agent';-import { FC, ReactNode, useMemo, useRef } from 'react';+import { FC, ReactNode, useMemo, useRef, useState } from 'react';import { useNavigate, useParams } from 'react-router-dom';import { useAgentSettings } from '../hooks/agent-settings';import { useAttachments } from '../hooks/use-attachments';+import { useChat } from '../hooks/use-chat';interface IProps {children: ReactNode;@@ -19,6 +20,12 @@ export const ChatContextProvider: FC<IProps> = ({ children }) => {const navigate = useNavigate();+ // Internal refs for tracking state+ const isFirstMessageSentRef = useRef(false);++ // Model override state (temporary, not saved to agent config)+ const [modelOverride, setModelOverride] = useState<string | null>(null);+// ============================================================================// API HOOKS// ============================================================================@@ -40,14 +47,67 @@ export const ChatContextProvider: FC<IProps> = ({ children }) => {const files = useAttachments({ agentId, chatId: agentSettings?.lastConversationId });+ // ============================================================================+ // CHAT STATE MANAGEMENT+ // ============================================================================++ const {+ messages,+ isStreaming,+ isProcessing,++ sendMessage,+ retryMessage,+ clearMessages,+ stopGenerating,+ } = useChat({+ agentId,+ chatId: agentSettings?.lastConversationId || '',+ modelId: modelOverride || agentSettings?.chatGptModel, // Use override if set, otherwise fall back to agent's default model+ onChatComplete: () => {+ if (!isFirstMessageSentRef.current) {+ isFirstMessageSentRef.current = true;+ }+ },+ onError: (err) => console.error('Chat error:', err), // eslint-disable-line no-console+ });+// Memoize the store to avoid unnecessary re-rendersconst values: IChatContext = useMemo(() => ({ref: { input: inputRef, container: containerRef },agent: { data: agent, settings: agentSettings, loading: agentLoading },files,+ chat: {+ messages,+ isStreaming,+ isProcessing,+ sendMessage,+ retryMessage,+ stopGenerating,+ clearMessages,+ },++ modelOverride,+ setModelOverride,}),- [inputRef, containerRef, agent, agentSettings, agentLoading, files],+ [+ inputRef,+ containerRef,+ agent,+ agentSettings,+ agentLoading,+ files,+ messages,+ isStreaming,+ isProcessing,+ sendMessage,+ retryMessage,+ stopGenerating,+ clearMessages,+ modelOverride,+ setModelOverride,+ ],);return <ChatContext.Provider value={values}>{children}</ChatContext.Provider>;diff --git a/packages/app/src/react/features/ai-chat/contexts/index.tsx b/packages/app/src/react/features/ai-chat/contexts/index.tsxindex eca43903..8ad7fbec 100644--- a/packages/app/src/react/features/ai-chat/contexts/index.tsx+++ b/packages/app/src/react/features/ai-chat/contexts/index.tsx@@ -27,8 +27,8 @@ interface ChatContextType {clearChatSession: () => Promise<void>;// Model override (temporary, not saved to agent config)- selectedModelOverride: string | null;- setSelectedModelOverride: (model: string | null) => void;+ modelOverride: string | null;+ setModelOverride: (model: string | null) => void;}const ChatContext = createContext<ChatContextType | undefined>(undefined);diff --git a/packages/app/src/react/features/ai-chat/hooks/use-agent-chat-context.ts b/packages/app/src/react/features/ai-chat/hooks/use-agent-chat-context.tsindex 12995703..6ceac31d 100644--- a/packages/app/src/react/features/ai-chat/hooks/use-agent-chat-context.ts+++ b/packages/app/src/react/features/ai-chat/hooks/use-agent-chat-context.ts@@ -51,8 +51,8 @@ export interface IUseAgentChatContextReturn {stopGenerating: () => void;clearChatSession: () => Promise<void>;// Model override (temporary, not saved to agent config)- selectedModelOverride: string | null;- setSelectedModelOverride: (model: string | null) => void;+ modelOverride: string | null;+ setModelOverride: (model: string | null) => void;};agent: ReturnType<typeof useAgent>['data'];agentSettings: ReturnType<typeof useAgentSettings>['data'];@@ -99,7 +99,7 @@ export const useAgentChatContext = (const hasInitializedChatRef = useRef(false);// Model override state (temporary, not saved to agent config)- const [selectedModelOverride, setSelectedModelOverride] = useState<string | null>(null);+ const [modelOverride, setModelOverride] = useState<string | null>(null);// ============================================================================// API HOOKS@@ -149,7 +149,7 @@ export const useAgentChatContext = (} = useChat({agentId,chatId: agentSettings?.lastConversationId || '',- modelId: selectedModelOverride || agentSettings?.chatGptModel, // Use override if set, otherwise fall back to agent's default model+ modelId: modelOverride || agentSettings?.chatGptModel, // Use override if set, otherwise fall back to agent's default modelonChatComplete: () => {if (!isFirstMessageSentRef.current) {isFirstMessageSentRef.current = true;@@ -166,9 +166,6 @@ export const useAgentChatContext = (const queryInputPlaceholder = agent ? `Message ${agent.name}...` : 'Message ...';const isMaxFilesUploaded = files.length >= 10;- // No conversion needed - using same types now! ✅- const sharedMessagesHistory: IChatMessage[] = messagesHistory;-// ============================================================================// CHAT ACTIONS// ============================================================================@@ -295,7 +292,7 @@ export const useAgentChatContext = (isGenerating: isStreaming,isInputProcessing,isRetrying: false, // Not implemented in new hook yet- messagesHistory: sharedMessagesHistory,+ messagesHistory,inputPlaceholder: queryInputPlaceholder,inputDisabled,@@ -306,8 +303,8 @@ export const useAgentChatContext = (clearChatSession,// Model override (temporary, not saved to agent config)- selectedModelOverride,- setSelectedModelOverride,+ modelOverride,+ setModelOverride,}),[// File handling dependencies@@ -324,7 +321,7 @@ export const useAgentChatContext = (// Chat state dependenciesisStreaming,isInputProcessing,- sharedMessagesHistory,+ messagesHistory,queryInputPlaceholder,inputDisabled,// Chat action dependencies@@ -333,8 +330,8 @@ export const useAgentChatContext = (stopGenerating,clearChatSession,// Model override dependencies- selectedModelOverride,- setSelectedModelOverride,+ modelOverride,+ setModelOverride,],);@@ -351,7 +348,7 @@ export const useAgentChatContext = (settings: isAgentSettingsLoading,chatCreating: isChatCreating,},- sharedMessagesHistory,+ sharedMessagesHistory: messagesHistory,handleFileDrop,};};diff --git a/packages/app/src/react/features/ai-chat/hooks/use-chat.ts b/packages/app/src/react/features/ai-chat/hooks/use-chat.tsindex d5695a98..34742b5e 100644--- a/packages/app/src/react/features/ai-chat/hooks/use-chat.ts+++ b/packages/app/src/react/features/ai-chat/hooks/use-chat.ts@@ -426,9 +426,7 @@ export const useChat = (config: IUseChatConfig): IUseChatReturn => {}// If no user message found, don't remove anything- if (lastUserMessageIndex === -1) {- return prev;- }+ if (lastUserMessageIndex === -1) return prev;// Remove everything from the last user message onwardsreturn prev.slice(0, lastUserMessageIndex);@@ -482,13 +480,13 @@ export const useChat = (config: IUseChatConfig): IUseChatReturn => {return {// State- messages, // ✅- isStreaming, // ✅- isProcessing, // ✅+ messages,+ isStreaming,+ isProcessing,// Actions- sendMessage, // ✅- clearMessages, // ✅+ sendMessage,+ clearMessages,retryMessage: retryLastMessage,stopGenerating,};