Merge branch 'master' into vsIcons

Author: Aniket-Engg

libs/remix-ai-core/src/helpers/streamHandler.ts

@@ -68,6 +68,7 @@ export const HandleOpenAIResponse = async (aiResponse: IAIStreamResponse | any,
   // Handle both IAIStreamResponse format and plain response for backward compatibility
   const streamResponse = aiResponse?.streamResponse || aiResponse
   const tool_callback = aiResponse?.callback
+  const toolExecutionStatusCallback = aiResponse?.toolExecutionStatusCallback
   const reader = streamResponse.body?.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
@@ -143,7 +144,13 @@ export const HandleOpenAIResponse = async (aiResponse: IAIStreamResponse | any,
 
           // Check if this is the finish reason for tool calls
           if (json.choices?.[0]?.finish_reason === "tool_calls" && tool_callback && toolCalls.size > 0) {
+            toolExecutionStatusCallback?.(true);
             const response = await tool_callback(Array.from(toolCalls.values()))
+            toolExecutionStatusCallback?.(false);
+            // Keep the callback attached for recursive calls
+            if (response && typeof response === 'object') {
+              response.toolExecutionStatusCallback = toolExecutionStatusCallback;
+            }
             cb("\n\n");
             HandleOpenAIResponse(response, cb, done_cb)
             return;
@@ -191,6 +198,7 @@ export const HandleMistralAIResponse = async (aiResponse: IAIStreamResponse | an
   // Handle both IAIStreamResponse format and plain response for backward compatibility
   const streamResponse = aiResponse?.streamResponse || aiResponse
   const tool_callback = aiResponse?.callback
+  const toolExecutionStatusCallback = aiResponse?.toolExecutionStatusCallback
   const reader = streamResponse.body?.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
@@ -234,7 +242,13 @@ export const HandleMistralAIResponse = async (aiResponse: IAIStreamResponse | an
           const json = JSON.parse(jsonStr);
           threadId = json?.id || threadId;
           if (json.choices[0].delta.tool_calls && tool_callback){
+            toolExecutionStatusCallback?.(true);
             const response = await tool_callback(json.choices[0].delta.tool_calls)
+            // Keep the callback attached for recursive calls
+            if (response && typeof response === 'object') {
+              response.toolExecutionStatusCallback = toolExecutionStatusCallback;
+            }
+            toolExecutionStatusCallback?.(false);
             cb("\n\n");
             HandleMistralAIResponse(response, cb, done_cb)
           } else if (json.choices[0].delta.content){
@@ -259,6 +273,7 @@ export const HandleAnthropicResponse = async (aiResponse: IAIStreamResponse | an
   // Handle both IAIStreamResponse format and plain response for backward compatibility
   const streamResponse = aiResponse?.streamResponse || aiResponse
   const tool_callback = aiResponse?.callback
+  const toolExecutionStatusCallback = aiResponse?.toolExecutionStatusCallback
   const reader = streamResponse.body?.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
@@ -334,7 +349,13 @@ export const HandleAnthropicResponse = async (aiResponse: IAIStreamResponse | an
             }));
 
             if (toolCalls.length > 0) {
+              toolExecutionStatusCallback?.(true);
               const response = await tool_callback(toolCalls)
+              toolExecutionStatusCallback?.(false);
+              // Keep the callback attached for recursive calls
+              if (response && typeof response === 'object') {
+                response.toolExecutionStatusCallback = toolExecutionStatusCallback;
+              }
               cb("\n\n");
               HandleAnthropicResponse(response, cb, done_cb)
               return;
@@ -361,6 +382,7 @@ export const HandleOllamaResponse = async (aiResponse: IAIStreamResponse | any,
   // Handle both IAIStreamResponse format and plain response for backward compatibility
   const streamResponse = aiResponse?.streamResponse || aiResponse
   const tool_callback = aiResponse?.callback
+  const toolExecutionStatusCallback = aiResponse?.toolExecutionStatusCallback
   const reader = streamResponse.body?.getReader();
   const decoder = new TextDecoder("utf-8");
   let resultText = "";
@@ -395,7 +417,13 @@ export const HandleOllamaResponse = async (aiResponse: IAIStreamResponse | any,
 
           // Handle tool calls in Ollama format
           if (parsed.message?.tool_calls && tool_callback) {
+            toolExecutionStatusCallback?.(true);
             const response = await tool_callback(parsed.message.tool_calls)
+            toolExecutionStatusCallback?.(false);
+            // Keep the callback attached for recursive calls
+            if (response && typeof response === 'object') {
+              response.toolExecutionStatusCallback = toolExecutionStatusCallback;
+            }
             cb("\n\n");
             HandleOllamaResponse(response, cb, done_cb, reasoning_cb)
             return;

libs/remix-ai-core/src/inferencers/mcp/mcpInferencer.ts

@@ -385,7 +385,7 @@ export class MCPInferencer extends RemoteInferencer implements ICompletions, IGe
       const response = await super.answer(enrichedPrompt, enhancedOptions);
       let toolExecutionCount = 0;
 
-      const toolExecutionCallback = async (tool_calls) => {
+      const toolExecutionStatusCallback = async (tool_calls) => {
 
         // avoid circular tooling
         if (toolExecutionCount >= this.MAX_TOOL_EXECUTIONS) {
@@ -503,13 +503,13 @@ export class MCPInferencer extends RemoteInferencer implements ICompletions, IGe
 
             // Send empty prompt - the tool results are in toolsMessages
             // Don't add extra prompts as they cause Anthropic to summarize instead of using full tool results
-            if (options.provider === 'openai' || options.provider === 'mistralai') return { streamResponse: await super.answer(prompt, followUpOptions), callback: toolExecutionCallback } as IAIStreamResponse;
-            else return { streamResponse: await super.answer("", followUpOptions), callback: toolExecutionCallback } as IAIStreamResponse;
+            if (options.provider === 'openai' || options.provider === 'mistralai') return { streamResponse: await super.answer(prompt, followUpOptions), callback: toolExecutionStatusCallback } as IAIStreamResponse;
+            else return { streamResponse: await super.answer("", followUpOptions), callback: toolExecutionStatusCallback } as IAIStreamResponse;
           }
         }
       }
 
-      return { streamResponse: response, callback:toolExecutionCallback } as IAIStreamResponse;
+      return { streamResponse: response, callback:toolExecutionStatusCallback } as IAIStreamResponse;
     } catch (error) {
       return { streamResponse: await super.answer(enrichedPrompt, options) };
     }

libs/remix-ai-core/src/types/types.ts

@@ -111,7 +111,8 @@ export interface IParams {
 
 export interface IAIStreamResponse{
   streamResponse: any,
-  callback?: any
+  callback?: any,
+  toolExecutionStatusCallback?: (isExecuting: boolean) => void
 }
 
 export enum AIRequestType {

libs/remix-ui/remix-ai-assistant/src/components/chat.tsx

@@ -116,6 +116,12 @@ export const ChatHistoryComponent: React.FC<ChatHistoryComponentProps> = ({
                     )}
                   </div>
                 </div>
+                {msg.role === 'assistant' && msg.isExecutingTools && (
+                  <div className="tool-execution-indicator mt-2 text-muted">
+                    <i className="fa fa-spinner fa-spin me-2"></i>
+                    <span>Executing tools...</span>
+                  </div>
+                )}
 
                 {/* Feedback buttons */}
                 {msg.role === 'assistant' && (

libs/remix-ui/remix-ai-assistant/src/components/remix-ui-remix-ai-assistant.tsx

@@ -427,6 +427,19 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
           ...prev,
           { id: assistantId, role: 'assistant', content: '', timestamp: Date.now(), sentiment: 'none' }
         ])
+
+        // Add tool execution callback to response object
+        const toolExecutionStatusCallback = (isExecuting: boolean) => {
+          setMessages(prev =>
+            prev.map(m => (m.id === assistantId ? { ...m, isExecutingTools: isExecuting } : m))
+          )
+        }
+
+        // Attach the callback to the response if it's an object
+        if (response && typeof response === 'object') {
+          response.toolExecutionStatusCallback = toolExecutionStatusCallback
+        }
+
         switch (assistantChoice) {
         case 'openai':
           HandleOpenAIResponse(

libs/remix-ui/remix-ai-assistant/src/css/remix-ai-assistant.css

@@ -675,3 +675,23 @@ mark,
 .aiMarkup :where(h3) { margin-top: .85rem; }
 
 .aiMarkup hr { margin: .95rem 0; }
+
+/* Tool execution indicator */
+.tool-execution-indicator {
+  display: flex;
+  align-items: center;
+  font-size: 0.9rem;
+  padding: 8px 12px;
+  border-radius: 6px;
+  background-color: rgba(88, 166, 255, 0.1);
+  border-left: 3px solid rgba(88, 166, 255, 0.5);
+}
+
+.tool-execution-indicator i {
+  color: #58a6ff;
+  font-size: 1rem;
+}
+
+.tool-execution-indicator span {
+  color: inherit;
+}

libs/remix-ui/remix-ai-assistant/src/lib/types.ts

@@ -4,6 +4,7 @@ export type ChatMessage = {
   content: string
   timestamp: number
   sentiment?: 'none' | 'like' | 'dislike'
+  isExecutingTools?: boolean
 }
 
 export const assistantAvatar = 'assets/img/remixai-logoDefault.webp'//'assets/img/aiLogo.svg'