Fix message ordering race condition by creating assistant messages on first chunk #2

The previous design created two database records within milliseconds, causing ActionCable to sometimes deliver them out of order. Now we only create the assistant message when actual content arrives from the API.

Author: crmne

lib/ruby_llm/chat.rb

@@ -93,18 +93,19 @@ def each(&)
     end
 
     def complete(&)
-      @on[:new_message]&.call
       response = @provider.complete(
         messages,
         tools: @tools,
         temperature: @temperature,
         model: @model.id,
         connection: @connection,
-        &
+        &wrap_streaming_block(&)
       )
-      @on[:end_message]&.call(response)
 
+      @on[:new_message]&.call unless block_given?
       add_message response
+      @on[:end_message]&.call(response)
+
       if response.tool_call?
         handle_tool_calls(response, &)
       else
@@ -124,11 +125,28 @@ def reset_messages!
 
     private
 
+    def wrap_streaming_block(&block)
+      return nil unless block_given?
+
+      first_chunk_received = false
+
+      proc do |chunk|
+        # Create message on first content chunk
+        unless first_chunk_received
+          first_chunk_received = true
+          @on[:new_message]&.call
+        end
+
+        # Pass chunk to user's block
+        block.call chunk
+      end
+    end
+
     def handle_tool_calls(response, &)
       response.tool_calls.each_value do |tool_call|
         @on[:new_message]&.call
         result = execute_tool tool_call
-        message = add_tool_result tool_call.id, result
+        message = add_message role: :tool, content: result.to_s, tool_call_id: tool_call.id
         @on[:end_message]&.call(message)
       end
 
@@ -140,13 +158,5 @@ def execute_tool(tool_call)
       args = tool_call.arguments
       tool.call(args)
     end
-
-    def add_tool_result(tool_use_id, result)
-      add_message(
-        role: :tool,
-        content: result.is_a?(Hash) && result[:error] ? result[:error] : result.to_s,
-        tool_call_id: tool_use_id
-      )
-    end
   end
 end

lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '1.3.2'
+  VERSION = '1.3.2beta1'
 end