runner code refactor, frontend papercuts

lib/elixir_ai/ai_tools.ex

@@ -131,7 +131,7 @@ defmodule ElixirAi.AiTools do
   # ---------------------------------------------------------------------------
 
   defp dispatch_to_liveview(server, tool_name, args) do
-    pids = GenServer.call(server, :get_liveview_pids)
+    pids = GenServer.call(server, {:session, :get_liveview_pids})
 
     case pids do
       [] ->

lib/elixir_ai/ai_utils/chat_utils.ex

@@ -30,12 +30,16 @@ defmodule ElixirAi.ChatUtils do
       Task.start_link(fn ->
         try do
           result = function.(args)
-          send(server, {:tool_response, current_message_id, tool_call_id, result})
+          send(server, {:stream, {:tool_response, current_message_id, tool_call_id, result}})
         rescue
           e ->
             reason = Exception.format(:error, e, __STACKTRACE__)
             Logger.error("Tool task crashed: #{reason}")
-            send(server, {:tool_response, current_message_id, tool_call_id, {:error, reason}})
+
+            send(
+              server,
+              {:stream, {:tool_response, current_message_id, tool_call_id, {:error, reason}}}
+            )
         end
       end)
     end
@@ -91,7 +95,7 @@ defmodule ElixirAi.ChatUtils do
 
         {:error, reason} ->
           Logger.warning("AI request failed: #{inspect(reason)} for #{api_url}")
-          send(server, {:ai_request_error, reason})
+          send(server, {:stream, {:ai_request_error, reason}})
       end
     end)
   end

lib/elixir_ai/ai_utils/stream_line_utils.ex

@@ -29,7 +29,7 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
       }) do
     send(
       server,
-      {:start_new_ai_response, id}
+      {:stream, {:start_new_ai_response, id}}
     )
   end
 
@@ -45,7 +45,7 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
 
     send(
       server,
-      {:ai_text_stream_finish, id}
+      {:stream, {:ai_text_stream_finish, id}}
     )
   end
 
@@ -61,7 +61,7 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
       }) do
     send(
       server,
-      {:ai_reasoning_chunk, id, reasoning_content}
+      {:stream, {:ai_reasoning_chunk, id, reasoning_content}}
     )
   end
 
@@ -77,7 +77,7 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
       }) do
     send(
       server,
-      {:ai_text_chunk, id, reasoning_content}
+      {:stream, {:ai_text_chunk, id, reasoning_content}}
     )
   end
 
@@ -105,12 +105,13 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
 
         send(
           server,
-          {:ai_tool_call_start, id, {tool_name, tool_args_start, tool_index, tool_call_id}}
+          {:stream,
+           {:ai_tool_call_start, id, {tool_name, tool_args_start, tool_index, tool_call_id}}}
         )
 
       %{"index" => tool_index, "function" => %{"arguments" => tool_args_diff}} ->
         # Logger.info("Received tool call middle for index #{tool_index}")
-        send(server, {:ai_tool_call_middle, id, {tool_args_diff, tool_index}})
+        send(server, {:stream, {:ai_tool_call_middle, id, {tool_args_diff, tool_index}}})
 
       other ->
         Logger.warning("Unmatched tool call item: #{inspect(other)}")
@@ -126,7 +127,7 @@ defmodule ElixirAi.AiUtils.StreamLineUtils do
         }
       ) do
     # Logger.info("Received tool_calls_finished with message: #{inspect(message)}")
-    send(server, {:ai_tool_call_end, id})
+    send(server, {:stream, {:ai_tool_call_end, id}})
   end
 
   def handle_stream_line(_server, %{"error" => error_info}) do

lib/elixir_ai/chat_runner.ex

@@ -1,429 +0,0 @@
-defmodule ElixirAi.ChatRunner do
-  require Logger
-  use GenServer
-  alias ElixirAi.{AiTools, Conversation, Message}
-  import ElixirAi.PubsubTopics
-
-  defp via(name), do: {:via, Horde.Registry, {ElixirAi.ChatRegistry, name}}
-
-  def new_user_message(name, text_content, opts \\ []) do
-    tool_choice = Keyword.get(opts, :tool_choice)
-    GenServer.cast(via(name), {:user_message, text_content, tool_choice})
-  end
-
-  def set_allowed_tools(name, tool_names) when is_list(tool_names) do
-    GenServer.call(via(name), {:set_allowed_tools, tool_names})
-  end
-
-  def set_tool_choice(name, tool_choice) when tool_choice in ["auto", "none", "required"] do
-    GenServer.call(via(name), {:set_tool_choice, tool_choice})
-  end
-
-  def register_liveview_pid(name, liveview_pid) when is_pid(liveview_pid) do
-    GenServer.call(via(name), {:register_liveview_pid, liveview_pid})
-  end
-
-  def deregister_liveview_pid(name, liveview_pid) when is_pid(liveview_pid) do
-    GenServer.call(via(name), {:deregister_liveview_pid, liveview_pid})
-  end
-
-  @spec get_conversation(String.t()) :: any()
-  def get_conversation(name) do
-    GenServer.call(via(name), :get_conversation)
-  end
-
-  def get_streaming_response(name) do
-    GenServer.call(via(name), :get_streaming_response)
-  end
-
-  def start_link(name: name) do
-    GenServer.start_link(__MODULE__, name, name: via(name))
-  end
-
-  def init(name) do
-    Phoenix.PubSub.subscribe(ElixirAi.PubSub, conversation_message_topic(name))
-
-    messages =
-      case Conversation.find_id(name) do
-        {:ok, conv_id} ->
-          Message.load_for_conversation(conv_id, topic: conversation_message_topic(name))
-
-        _ ->
-          []
-      end
-
-    last_message = List.last(messages)
-
-    provider =
-      case Conversation.find_provider(name) do
-        {:ok, p} -> p
-        _ -> nil
-      end
-
-    allowed_tools =
-      case Conversation.find_allowed_tools(name) do
-        {:ok, tools} -> tools
-        _ -> AiTools.all_tool_names()
-      end
-
-    tool_choice =
-      case Conversation.find_tool_choice(name) do
-        {:ok, tc} -> tc
-        _ -> "auto"
-      end
-
-    server_tools = AiTools.build_server_tools(self(), allowed_tools)
-    liveview_tools = AiTools.build_liveview_tools(self(), allowed_tools)
-
-    if last_message && last_message.role == :user do
-      Logger.info(
-        "Last message role was #{last_message.role}, requesting AI response for conversation #{name}"
-      )
-
-      broadcast_ui(name, :recovery_restart)
-
-      ElixirAi.ChatUtils.request_ai_response(
-        self(),
-        messages,
-        server_tools ++ liveview_tools,
-        provider,
-        tool_choice
-      )
-    end
-
-    {:ok,
-     %{
-       name: name,
-       messages: messages,
-       streaming_response: nil,
-       pending_tool_calls: [],
-       allowed_tools: allowed_tools,
-       tool_choice: tool_choice,
-       server_tools: server_tools,
-       liveview_tools: liveview_tools,
-       provider: provider,
-       liveview_pids: %{}
-     }}
-  end
-
-  def handle_cast({:user_message, text_content, tool_choice_override}, state) do
-    effective_tool_choice = tool_choice_override || state.tool_choice
-    new_message = %{role: :user, content: text_content, tool_choice: tool_choice_override}
-    broadcast_ui(state.name, {:user_chat_message, new_message})
-    store_message(state.name, new_message)
-    new_state = %{state | messages: state.messages ++ [new_message]}
-
-    ElixirAi.ChatUtils.request_ai_response(
-      self(),
-      new_state.messages,
-      state.server_tools ++ state.liveview_tools,
-      state.provider,
-      effective_tool_choice
-    )
-
-    {:noreply, new_state}
-  end
-
-  @ai_stream_events [
-    :ai_text_chunk,
-    :ai_reasoning_chunk,
-    :ai_text_stream_finish,
-    :ai_tool_call_start,
-    :ai_tool_call_middle,
-    :ai_tool_call_end,
-    :tool_response
-  ]
-
-  def handle_info({:start_new_ai_response, id}, state) do
-    starting_response = %{id: id, reasoning_content: "", content: "", tool_calls: []}
-    broadcast_ui(state.name, {:start_ai_response_stream, starting_response})
-
-    {:noreply, %{state | streaming_response: starting_response}}
-  end
-
-  def handle_info(
-        msg,
-        %{streaming_response: %{id: current_id}} = state
-      )
-      when is_tuple(msg) and tuple_size(msg) in [2, 3] and
-             elem(msg, 0) in @ai_stream_events and elem(msg, 1) != current_id do
-    Logger.warning(
-      "Received #{elem(msg, 0)} for id #{inspect(elem(msg, 1))} but current streaming response is for id #{inspect(current_id)}"
-    )
-
-    {:noreply, state}
-  end
-
-  def handle_info({:ai_reasoning_chunk, _id, reasoning_content}, state) do
-    broadcast_ui(state.name, {:reasoning_chunk_content, reasoning_content})
-
-    {:noreply,
-     %{
-       state
-       | streaming_response: %{
-           state.streaming_response
-           | reasoning_content: state.streaming_response.reasoning_content <> reasoning_content
-         }
-     }}
-  end
-
-  def handle_info({:ai_text_chunk, _id, text_content}, state) do
-    broadcast_ui(state.name, {:text_chunk_content, text_content})
-
-    {:noreply,
-     %{
-       state
-       | streaming_response: %{
-           state.streaming_response
-           | content: state.streaming_response.content <> text_content
-         }
-     }}
-  end
-
-  def handle_info({:ai_text_stream_finish, _id}, state) do
-    Logger.info(
-      "AI stream finished for id #{state.streaming_response.id}, broadcasting end of AI response"
-    )
-
-    final_message = %{
-      role: :assistant,
-      content: state.streaming_response.content,
-      reasoning_content: state.streaming_response.reasoning_content,
-      tool_calls: state.streaming_response.tool_calls
-    }
-
-    broadcast_ui(state.name, {:end_ai_response, final_message})
-    store_message(state.name, final_message)
-
-    {:noreply,
-     %{
-       state
-       | streaming_response: nil,
-         messages: state.messages ++ [final_message]
-     }}
-  end
-
-  def handle_info(
-        {:ai_tool_call_start, _id, {tool_name, tool_args_start, tool_index, tool_call_id}},
-        state
-      ) do
-    Logger.info("AI started tool call #{tool_name}")
-
-    new_streaming_response = %{
-      state.streaming_response
-      | tool_calls:
-          state.streaming_response.tool_calls ++
-            [
-              %{
-                name: tool_name,
-                arguments: tool_args_start,
-                index: tool_index,
-                id: tool_call_id
-              }
-            ]
-    }
-
-    {:noreply, %{state | streaming_response: new_streaming_response}}
-  end
-
-  def handle_info({:ai_tool_call_middle, _id, {tool_args_diff, tool_index}}, state) do
-    new_streaming_response = %{
-      state.streaming_response
-      | tool_calls:
-          Enum.map(state.streaming_response.tool_calls, fn
-            %{
-              arguments: existing_args,
-              index: ^tool_index
-            } = tool_call ->
-              %{
-                tool_call
-                | arguments: existing_args <> tool_args_diff
-              }
-
-            other ->
-              other
-          end)
-    }
-
-    {:noreply, %{state | streaming_response: new_streaming_response}}
-  end
-
-  def handle_info({:ai_tool_call_end, id}, state) do
-    tool_request_message = %{
-      role: :assistant,
-      content: state.streaming_response.content,
-      reasoning_content: state.streaming_response.reasoning_content,
-      tool_calls: state.streaming_response.tool_calls
-    }
-
-    broadcast_ui(state.name, {:tool_request_message, tool_request_message})
-
-    {failed_call_messages, pending_call_ids} =
-      Enum.reduce(state.streaming_response.tool_calls, {[], []}, fn tool_call,
-                                                                    {failed, pending} ->
-        with {:ok, decoded_args} <- Jason.decode(tool_call.arguments),
-             tool when not is_nil(tool) <-
-               Enum.find(state.server_tools ++ state.liveview_tools, fn t ->
-                 t.name == tool_call.name
-               end) do
-          tool.run_function.(id, tool_call.id, decoded_args)
-          {failed, [tool_call.id | pending]}
-        else
-          {:error, e} ->
-            error_msg = "Failed to decode tool arguments: #{inspect(e)}"
-            Logger.error("Tool call #{tool_call.name} failed: #{error_msg}")
-            {[%{role: :tool, content: error_msg, tool_call_id: tool_call.id} | failed], pending}
-
-          nil ->
-            error_msg = "No tool definition found for #{tool_call.name}"
-            Logger.error(error_msg)
-            {[%{role: :tool, content: error_msg, tool_call_id: tool_call.id} | failed], pending}
-        end
-      end)
-
-    store_message(state.name, [tool_request_message] ++ failed_call_messages)
-
-    {:noreply,
-     %{
-       state
-       | messages: state.messages ++ [tool_request_message] ++ failed_call_messages,
-         pending_tool_calls: pending_call_ids
-     }}
-  end
-
-  def handle_info({:tool_response, _id, tool_call_id, result}, state) do
-    new_message = %{role: :tool, content: inspect(result), tool_call_id: tool_call_id}
-
-    broadcast_ui(state.name, {:one_tool_finished, new_message})
-    store_message(state.name, new_message)
-
-    new_pending_tool_calls =
-      Enum.filter(state.pending_tool_calls, fn id -> id != tool_call_id end)
-
-    new_streaming_response =
-      case new_pending_tool_calls do
-        [] ->
-          nil
-
-        _ ->
-          state.streaming_response
-      end
-
-    if new_pending_tool_calls == [] do
-      broadcast_ui(state.name, :tool_calls_finished)
-
-      ElixirAi.ChatUtils.request_ai_response(
-        self(),
-        state.messages ++ [new_message],
-        state.server_tools ++ state.liveview_tools,
-        state.provider,
-        state.tool_choice
-      )
-    end
-
-    {:noreply,
-     %{
-       state
-       | pending_tool_calls: new_pending_tool_calls,
-         streaming_response: new_streaming_response,
-         messages: state.messages ++ [new_message]
-     }}
-  end
-
-  def handle_info({:db_error, reason}, state) do
-    broadcast_ui(state.name, {:db_error, reason})
-    {:noreply, state}
-  end
-
-  def handle_info({:sql_result_validation_error, error}, state) do
-    Logger.error("ChatRunner received sql_result_validation_error: #{inspect(error)}")
-    broadcast_ui(state.name, {:db_error, "Schema validation error: #{inspect(error)}"})
-    {:noreply, state}
-  end
-
-  def handle_info({:store_message, _name, _message}, state) do
-    {:noreply, state}
-  end
-
-  def handle_info({:ai_request_error, reason}, state) do
-    Logger.error("AI request error: #{inspect(reason)}")
-    broadcast_ui(state.name, {:ai_request_error, reason})
-    {:noreply, %{state | streaming_response: nil, pending_tool_calls: []}}
-  end
-
-  def handle_info({:DOWN, ref, :process, pid, _reason}, state) do
-    case Map.get(state.liveview_pids, pid) do
-      ^ref ->
-        Logger.info("ChatRunner #{state.name}: LiveView #{inspect(pid)} disconnected")
-        {:noreply, %{state | liveview_pids: Map.delete(state.liveview_pids, pid)}}
-
-      _ ->
-        {:noreply, state}
-    end
-  end
-
-  def handle_call(:get_conversation, _from, state) do
-    {:reply, state, state}
-  end
-
-  def handle_call(:get_streaming_response, _from, state) do
-    {:reply, state.streaming_response, state}
-  end
-
-  def handle_call(:get_liveview_pids, _from, state) do
-    {:reply, Map.keys(state.liveview_pids), state}
-  end
-
-  def handle_call({:register_liveview_pid, liveview_pid}, _from, state) do
-    ref = Process.monitor(liveview_pid)
-    {:reply, :ok, %{state | liveview_pids: Map.put(state.liveview_pids, liveview_pid, ref)}}
-  end
-
-  def handle_call({:deregister_liveview_pid, liveview_pid}, _from, state) do
-    case Map.pop(state.liveview_pids, liveview_pid) do
-      {nil, _} ->
-        {:reply, :ok, state}
-
-      {ref, new_pids} ->
-        Process.demonitor(ref, [:flush])
-        {:reply, :ok, %{state | liveview_pids: new_pids}}
-    end
-  end
-
-  def handle_call({:set_tool_choice, tool_choice}, _from, state) do
-    Conversation.update_tool_choice(state.name, tool_choice)
-    {:reply, :ok, %{state | tool_choice: tool_choice}}
-  end
-
-  def handle_call({:set_allowed_tools, tool_names}, _from, state) do
-    Conversation.update_allowed_tools(state.name, tool_names)
-    server_tools = AiTools.build_server_tools(self(), tool_names)
-    liveview_tools = AiTools.build_liveview_tools(self(), tool_names)
-
-    {:reply, :ok,
-     %{
-       state
-       | allowed_tools: tool_names,
-         server_tools: server_tools,
-         liveview_tools: liveview_tools
-     }}
-  end
-
-  defp broadcast_ui(name, msg),
-    do: Phoenix.PubSub.broadcast(ElixirAi.PubSub, chat_topic(name), msg)
-
-  defp store_message(name, messages) when is_list(messages) do
-    Enum.each(messages, &store_message(name, &1))
-    messages
-  end
-
-  defp store_message(name, message) do
-    Phoenix.PubSub.broadcast(
-      ElixirAi.PubSub,
-      conversation_message_topic(name),
-      {:store_message, name, message}
-    )
-
-    message
-  end
-end

lib/elixir_ai/chat_runner/chat_runner.ex

@@ -0,0 +1,156 @@
+defmodule ElixirAi.ChatRunner do
+  require Logger
+  use GenServer
+  alias ElixirAi.{AiTools, Conversation, Message}
+  import ElixirAi.PubsubTopics
+  import ElixirAi.ChatRunner.OutboundHelpers
+
+  alias ElixirAi.ChatRunner.{
+    ConversationCalls,
+    ErrorHandler,
+    LiveviewSession,
+    StreamHandler,
+    ToolConfig
+  }
+
+  @ai_stream_events [
+    :ai_text_chunk,
+    :ai_reasoning_chunk,
+    :ai_text_stream_finish,
+    :ai_tool_call_start,
+    :ai_tool_call_middle,
+    :ai_tool_call_end,
+    :tool_response
+  ]
+
+  defp via(name), do: {:via, Horde.Registry, {ElixirAi.ChatRegistry, name}}
+
+  def new_user_message(name, text_content, opts \\ []) do
+    tool_choice = Keyword.get(opts, :tool_choice)
+    GenServer.cast(via(name), {:conversation, {:user_message, text_content, tool_choice}})
+  end
+
+  def set_allowed_tools(name, tool_names) when is_list(tool_names) do
+    GenServer.call(via(name), {:tool_config, {:set_allowed_tools, tool_names}})
+  end
+
+  def set_tool_choice(name, tool_choice) when tool_choice in ["auto", "none", "required"] do
+    GenServer.call(via(name), {:tool_config, {:set_tool_choice, tool_choice}})
+  end
+
+  def register_liveview_pid(name, liveview_pid) when is_pid(liveview_pid) do
+    GenServer.call(via(name), {:session, {:register_liveview_pid, liveview_pid}})
+  end
+
+  def deregister_liveview_pid(name, liveview_pid) when is_pid(liveview_pid) do
+    GenServer.call(via(name), {:session, {:deregister_liveview_pid, liveview_pid}})
+  end
+
+  def get_conversation(name) do
+    GenServer.call(via(name), {:conversation, :get_conversation})
+  end
+
+  def get_streaming_response(name) do
+    GenServer.call(via(name), {:conversation, :get_streaming_response})
+  end
+
+  def start_link(name: name) do
+    GenServer.start_link(__MODULE__, name, name: via(name))
+  end
+
+  def init(name) do
+    Phoenix.PubSub.subscribe(ElixirAi.PubSub, conversation_message_topic(name))
+
+    messages =
+      case Conversation.find_id(name) do
+        {:ok, conv_id} ->
+          Message.load_for_conversation(conv_id, topic: conversation_message_topic(name))
+
+        _ ->
+          []
+      end
+
+    last_message = List.last(messages)
+
+    provider =
+      case Conversation.find_provider(name) do
+        {:ok, p} -> p
+        _ -> nil
+      end
+
+    allowed_tools =
+      case Conversation.find_allowed_tools(name) do
+        {:ok, tools} -> tools
+        _ -> AiTools.all_tool_names()
+      end
+
+    tool_choice =
+      case Conversation.find_tool_choice(name) do
+        {:ok, tc} -> tc
+        _ -> "auto"
+      end
+
+    server_tools = AiTools.build_server_tools(self(), allowed_tools)
+    liveview_tools = AiTools.build_liveview_tools(self(), allowed_tools)
+
+    if last_message && last_message.role == :user do
+      Logger.info(
+        "Last message role was #{last_message.role}, requesting AI response for conversation #{name}"
+      )
+
+      broadcast_ui(name, :recovery_restart)
+
+      ElixirAi.ChatUtils.request_ai_response(
+        self(),
+        messages,
+        server_tools ++ liveview_tools,
+        provider,
+        tool_choice
+      )
+    end
+
+    {:ok,
+     %{
+       name: name,
+       messages: messages,
+       streaming_response: nil,
+       pending_tool_calls: [],
+       allowed_tools: allowed_tools,
+       tool_choice: tool_choice,
+       server_tools: server_tools,
+       liveview_tools: liveview_tools,
+       provider: provider,
+       liveview_pids: %{}
+     }}
+  end
+
+  def handle_cast({:conversation, inner}, state), do: ConversationCalls.handle_cast(inner, state)
+
+  def handle_info(
+        {:stream, msg},
+        %{streaming_response: %{id: current_id}} = state
+      )
+      when is_tuple(msg) and tuple_size(msg) in [2, 3] and
+             elem(msg, 0) in @ai_stream_events and elem(msg, 1) != current_id do
+    Logger.warning(
+      "Received #{elem(msg, 0)} for id #{inspect(elem(msg, 1))} but current streaming response is for id #{inspect(current_id)}"
+    )
+
+    {:noreply, state}
+  end
+
+  def handle_info({:stream, inner}, state), do: StreamHandler.handle(inner, state)
+  def handle_info({:error, inner}, state), do: ErrorHandler.handle(inner, state)
+
+  def handle_info({:DOWN, ref, :process, pid, reason}, state),
+    do: LiveviewSession.handle_down(ref, pid, reason, state)
+
+  def handle_call({:conversation, inner}, from, state),
+    do: ConversationCalls.handle_call(inner, from, state)
+
+  def handle_call({:session, inner}, from, state),
+    do: LiveviewSession.handle_call(inner, from, state)
+
+  def handle_call({:tool_config, inner}, from, state),
+    do: ToolConfig.handle_call(inner, from, state)
+end

lib/elixir_ai/chat_runner/conversation_calls.ex

@@ -0,0 +1,29 @@
+defmodule ElixirAi.ChatRunner.ConversationCalls do
+  import ElixirAi.ChatRunner.OutboundHelpers
+
+  def handle_cast({:user_message, text_content, tool_choice_override}, state) do
+    effective_tool_choice = tool_choice_override || state.tool_choice
+    new_message = %{role: :user, content: text_content, tool_choice: tool_choice_override}
+    broadcast_ui(state.name, {:user_chat_message, new_message})
+    store_message(state.name, new_message)
+    new_state = %{state | messages: state.messages ++ [new_message]}
+
+    ElixirAi.ChatUtils.request_ai_response(
+      self(),
+      new_state.messages,
+      state.server_tools ++ state.liveview_tools,
+      state.provider,
+      effective_tool_choice
+    )
+
+    {:noreply, new_state}
+  end
+
+  def handle_call(:get_conversation, _from, state) do
+    {:reply, state, state}
+  end
+
+  def handle_call(:get_streaming_response, _from, state) do
+    {:reply, state.streaming_response, state}
+  end
+end

lib/elixir_ai/chat_runner/error_handler.ex

@@ -0,0 +1,19 @@
+defmodule ElixirAi.ChatRunner.ErrorHandler do
+  require Logger
+  import ElixirAi.ChatRunner.OutboundHelpers
+
+  def handle({:db_error, reason}, state) do
+    broadcast_ui(state.name, {:db_error, reason})
+    {:noreply, state}
+  end
+
+  def handle({:sql_result_validation_error, error}, state) do
+    Logger.error("ChatRunner received sql_result_validation_error: #{inspect(error)}")
+    broadcast_ui(state.name, {:db_error, "Schema validation error: #{inspect(error)}"})
+    {:noreply, state}
+  end
+
+  def handle({:store_message, _name, _message}, state) do
+    {:noreply, state}
+  end
+end

lib/elixir_ai/chat_runner/liveview_session.ex

@@ -0,0 +1,34 @@
+defmodule ElixirAi.ChatRunner.LiveviewSession do
+  require Logger
+
+  def handle_call(:get_liveview_pids, _from, state) do
+    {:reply, Map.keys(state.liveview_pids), state}
+  end
+
+  def handle_call({:register_liveview_pid, liveview_pid}, _from, state) do
+    ref = Process.monitor(liveview_pid)
+    {:reply, :ok, %{state | liveview_pids: Map.put(state.liveview_pids, liveview_pid, ref)}}
+  end
+
+  def handle_call({:deregister_liveview_pid, liveview_pid}, _from, state) do
+    case Map.pop(state.liveview_pids, liveview_pid) do
+      {nil, _} ->
+        {:reply, :ok, state}
+
+      {ref, new_pids} ->
+        Process.demonitor(ref, [:flush])
+        {:reply, :ok, %{state | liveview_pids: new_pids}}
+    end
+  end
+
+  def handle_down(ref, pid, _reason, state) do
+    case Map.get(state.liveview_pids, pid) do
+      ^ref ->
+        Logger.info("ChatRunner #{state.name}: LiveView #{inspect(pid)} disconnected")
+        {:noreply, %{state | liveview_pids: Map.delete(state.liveview_pids, pid)}}
+
+      _ ->
+        {:noreply, state}
+    end
+  end
+end

lib/elixir_ai/chat_runner/outbound_helpers.ex

@@ -0,0 +1,21 @@
+defmodule ElixirAi.ChatRunner.OutboundHelpers do
+  import ElixirAi.PubsubTopics
+
+  def broadcast_ui(name, msg),
+    do: Phoenix.PubSub.broadcast(ElixirAi.PubSub, chat_topic(name), msg)
+
+  def store_message(name, messages) when is_list(messages) do
+    Enum.each(messages, &store_message(name, &1))
+    messages
+  end
+
+  def store_message(name, message) do
+    Phoenix.PubSub.broadcast(
+      ElixirAi.PubSub,
+      conversation_message_topic(name),
+      {:error, {:store_message, name, message}}
+    )
+
+    message
+  end
+end

lib/elixir_ai/chat_runner/stream_handler.ex

@@ -0,0 +1,183 @@
+defmodule ElixirAi.ChatRunner.StreamHandler do
+  require Logger
+  import ElixirAi.ChatRunner.OutboundHelpers
+
+  def handle({:start_new_ai_response, id}, state) do
+    starting_response = %{id: id, reasoning_content: "", content: "", tool_calls: []}
+    broadcast_ui(state.name, {:start_ai_response_stream, starting_response})
+    {:noreply, %{state | streaming_response: starting_response}}
+  end
+
+  def handle({:ai_reasoning_chunk, _id, reasoning_content}, state) do
+    broadcast_ui(state.name, {:reasoning_chunk_content, reasoning_content})
+
+    {:noreply,
+     %{
+       state
+       | streaming_response: %{
+           state.streaming_response
+           | reasoning_content: state.streaming_response.reasoning_content <> reasoning_content
+         }
+     }}
+  end
+
+  def handle({:ai_text_chunk, _id, text_content}, state) do
+    broadcast_ui(state.name, {:text_chunk_content, text_content})
+
+    {:noreply,
+     %{
+       state
+       | streaming_response: %{
+           state.streaming_response
+           | content: state.streaming_response.content <> text_content
+         }
+     }}
+  end
+
+  def handle({:ai_text_stream_finish, _id}, state) do
+    Logger.info(
+      "AI stream finished for id #{state.streaming_response.id}, broadcasting end of AI response"
+    )
+
+    final_message = %{
+      role: :assistant,
+      content: state.streaming_response.content,
+      reasoning_content: state.streaming_response.reasoning_content,
+      tool_calls: state.streaming_response.tool_calls
+    }
+
+    broadcast_ui(state.name, {:end_ai_response, final_message})
+    store_message(state.name, final_message)
+
+    {:noreply,
+     %{
+       state
+       | streaming_response: nil,
+         messages: state.messages ++ [final_message]
+     }}
+  end
+
+  def handle(
+        {:ai_tool_call_start, _id, {tool_name, tool_args_start, tool_index, tool_call_id}},
+        state
+      ) do
+    Logger.info("AI started tool call #{tool_name}")
+
+    new_streaming_response = %{
+      state.streaming_response
+      | tool_calls:
+          state.streaming_response.tool_calls ++
+            [
+              %{
+                name: tool_name,
+                arguments: tool_args_start,
+                index: tool_index,
+                id: tool_call_id
+              }
+            ]
+    }
+
+    {:noreply, %{state | streaming_response: new_streaming_response}}
+  end
+
+  def handle({:ai_tool_call_middle, _id, {tool_args_diff, tool_index}}, state) do
+    new_streaming_response = %{
+      state.streaming_response
+      | tool_calls:
+          Enum.map(state.streaming_response.tool_calls, fn
+            %{arguments: existing_args, index: ^tool_index} = tool_call ->
+              %{tool_call | arguments: existing_args <> tool_args_diff}
+
+            other ->
+              other
+          end)
+    }
+
+    {:noreply, %{state | streaming_response: new_streaming_response}}
+  end
+
+  def handle({:ai_tool_call_end, id}, state) do
+    tool_request_message = %{
+      role: :assistant,
+      content: state.streaming_response.content,
+      reasoning_content: state.streaming_response.reasoning_content,
+      tool_calls: state.streaming_response.tool_calls
+    }
+
+    broadcast_ui(state.name, {:tool_request_message, tool_request_message})
+
+    {failed_call_messages, pending_call_ids} =
+      Enum.reduce(state.streaming_response.tool_calls, {[], []}, fn tool_call,
+                                                                    {failed, pending} ->
+        with {:ok, decoded_args} <- Jason.decode(tool_call.arguments),
+             tool when not is_nil(tool) <-
+               Enum.find(state.server_tools ++ state.liveview_tools, fn t ->
+                 t.name == tool_call.name
+               end) do
+          tool.run_function.(id, tool_call.id, decoded_args)
+          {failed, [tool_call.id | pending]}
+        else
+          {:error, e} ->
+            error_msg = "Failed to decode tool arguments: #{inspect(e)}"
+            Logger.error("Tool call #{tool_call.name} failed: #{error_msg}")
+            {[%{role: :tool, content: error_msg, tool_call_id: tool_call.id} | failed], pending}
+
+          nil ->
+            error_msg = "No tool definition found for #{tool_call.name}"
+            Logger.error(error_msg)
+            {[%{role: :tool, content: error_msg, tool_call_id: tool_call.id} | failed], pending}
+        end
+      end)
+
+    store_message(state.name, [tool_request_message] ++ failed_call_messages)
+
+    {:noreply,
+     %{
+       state
+       | messages: state.messages ++ [tool_request_message] ++ failed_call_messages,
+         pending_tool_calls: pending_call_ids
+     }}
+  end
+
+  def handle({:tool_response, _id, tool_call_id, result}, state) do
+    new_message = %{role: :tool, content: inspect(result), tool_call_id: tool_call_id}
+
+    broadcast_ui(state.name, {:one_tool_finished, new_message})
+    store_message(state.name, new_message)
+
+    new_pending_tool_calls =
+      Enum.filter(state.pending_tool_calls, fn id -> id != tool_call_id end)
+
+    new_streaming_response =
+      case new_pending_tool_calls do
+        [] -> nil
+        _ -> state.streaming_response
+      end
+
+    if new_pending_tool_calls == [] do
+      broadcast_ui(state.name, :tool_calls_finished)
+
+      ElixirAi.ChatUtils.request_ai_response(
+        self(),
+        state.messages ++ [new_message],
+        state.server_tools ++ state.liveview_tools,
+        state.provider,
+        state.tool_choice
+      )
+    end
+
+    {:noreply,
+     %{
+       state
+       | pending_tool_calls: new_pending_tool_calls,
+         streaming_response: new_streaming_response,
+         messages: state.messages ++ [new_message]
+     }}
+  end
+
+  def handle({:ai_request_error, reason}, state) do
+    Logger.error("AI request error: #{inspect(reason)}")
+    broadcast_ui(state.name, {:ai_request_error, reason})
+    {:noreply, %{state | streaming_response: nil, pending_tool_calls: []}}
+  end
+end

lib/elixir_ai/chat_runner/tool_config.ex

@@ -0,0 +1,22 @@
+defmodule ElixirAi.ChatRunner.ToolConfig do
+  alias ElixirAi.{AiTools, Conversation}
+
+  def handle_call({:set_tool_choice, tool_choice}, _from, state) do
+    Conversation.update_tool_choice(state.name, tool_choice)
+    {:reply, :ok, %{state | tool_choice: tool_choice}}
+  end
+
+  def handle_call({:set_allowed_tools, tool_names}, _from, state) do
+    Conversation.update_allowed_tools(state.name, tool_names)
+    server_tools = AiTools.build_server_tools(self(), tool_names)
+    liveview_tools = AiTools.build_liveview_tools(self(), tool_names)
+
+    {:reply, :ok,
+     %{
+       state
+       | allowed_tools: tool_names,
+         server_tools: server_tools,
+         liveview_tools: liveview_tools
+     }}
+  end
+end

lib/elixir_ai/conversation_manager.ex

@@ -109,17 +109,20 @@ defmodule ElixirAi.ConversationManager do
     {:noreply, %{state | runners: runners}}
   end
 
-  def handle_info({:db_error, reason}, state) do
+  def handle_info({:error, {:db_error, reason}}, state) do
     Logger.error("ConversationManager received db_error: #{inspect(reason)}")
     {:noreply, state}
   end
 
-  def handle_info({:sql_result_validation_error, error}, state) do
+  def handle_info({:error, {:sql_result_validation_error, error}}, state) do
     Logger.error("ConversationManager received sql_result_validation_error: #{inspect(error)}")
     {:noreply, state}
   end
 
-  def handle_info({:store_message, name, message}, %{conversations: conversations} = state) do
+  def handle_info(
+        {:error, {:store_message, name, message}},
+        %{conversations: conversations} = state
+      ) do
     case Conversation.find_id(name) do
       {:ok, conv_id} ->
         Message.insert(conv_id, message, topic: conversation_message_topic(name))
@@ -177,7 +180,7 @@ defmodule ElixirAi.ConversationManager do
     case start_and_subscribe(name, state) do
       {:ok, pid, new_subscriptions, new_runners} ->
         new_state = %{state | subscriptions: new_subscriptions, runners: new_runners}
-        conversation = GenServer.call(pid, :get_conversation)
+        conversation = GenServer.call(pid, {:conversation, :get_conversation})
         {:reply, {:ok, Map.put(conversation, :runner_pid, pid)}, new_state}
 
       {:error, _reason} = error ->

lib/elixir_ai/data/db_helpers.ex

@@ -28,7 +28,7 @@ defmodule ElixirAi.Data.DbHelpers do
         Phoenix.PubSub.broadcast(
           ElixirAi.PubSub,
           topic,
-          {:db_error, Exception.message(exception)}
+          {:error, {:db_error, Exception.message(exception)}}
         )
 
         {:error, :db_error}
@@ -55,7 +55,13 @@ defmodule ElixirAi.Data.DbHelpers do
 
       error ->
         Logger.error("Validation error: #{inspect(error)}")
-        Phoenix.PubSub.broadcast(ElixirAi.PubSub, topic, {:sql_result_validation_error, error})
+
+        Phoenix.PubSub.broadcast(
+          ElixirAi.PubSub,
+          topic,
+          {:error, {:sql_result_validation_error, error}}
+        )
+
         error
     end)
   end

lib/elixir_ai_web/chat/chat_live.ex

@@ -133,7 +133,7 @@ defmodule ElixirAiWeb.ChatLive do
 
   def handle_info(:sync_streaming, %{assigns: %{runner_pid: pid}} = socket)
       when is_pid(pid) do
-    case GenServer.call(pid, :get_streaming_response) do
+    case GenServer.call(pid, {:conversation, :get_streaming_response}) do
       nil ->
         {:noreply, assign(socket, streaming_response: nil)}
 
@@ -285,7 +285,7 @@ defmodule ElixirAiWeb.ChatLive do
   end
 
   defp get_snapshot(%{assigns: %{runner_pid: pid}} = _socket) when is_pid(pid) do
-    case GenServer.call(pid, :get_streaming_response) do
+    case GenServer.call(pid, {:conversation, :get_streaming_response}) do
       nil -> %{id: nil, content: "", reasoning_content: "", tool_calls: []}
       snapshot -> snapshot
     end

lib/elixir_ai_web/voice/voice_live.ex

@@ -3,85 +3,125 @@ defmodule ElixirAiWeb.VoiceLive do
   require Logger
 
   def mount(_params, _session, socket) do
-    {:ok, assign(socket, state: :idle, transcription: nil), layout: false}
+    {:ok, assign(socket, state: :idle, transcription: nil, expanded: false), layout: false}
   end
 
   def render(assigns) do
     ~H"""
     <div id="voice-control-hook" phx-hook="VoiceControl">
-      <div class="fixed top-4 right-4 w-72 bg-cyan-950/95 border border-cyan-800 rounded-2xl shadow-2xl z-50 p-4 flex flex-col gap-3 backdrop-blur">
+      <%= if not @expanded do %>
-        <div class="flex items-center gap-3">
+        <%!-- Collapsed: semi-transparent mic button, still listens to Ctrl+Space via hook --%>
-          <%= if @state == :idle do %>
+        <button
-            <svg
+          phx-click="expand"
-              xmlns="http://www.w3.org/2000/svg"
+          title="Voice input (Ctrl+Space)"
-              class="h-4 w-4 text-cyan-500 shrink-0"
+          class="fixed top-4 right-4 z-50 p-2.5 rounded-full bg-cyan-900/50 hover:bg-cyan-800/80 border border-cyan-700/50 hover:border-cyan-600 text-cyan-500/70 hover:text-cyan-300 transition-all duration-200 opacity-50 hover:opacity-100"
-              viewBox="0 0 24 24"
+        >
-              fill="currentColor"
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            class="h-5 w-5"
+            viewBox="0 0 24 24"
+            fill="currentColor"
+          >
+            <path d="M12 1a4 4 0 0 1 4 4v7a4 4 0 0 1-8 0V5a4 4 0 0 1 4-4zm0 2a2 2 0 0 0-2 2v7a2 2 0 1 0 4 0V5a2 2 0 0 0-2-2zm-7 9a7 7 0 0 0 14 0h2a9 9 0 0 1-8 8.94V23h-2v-2.06A9 9 0 0 1 3 12H5z" />
+          </svg>
+        </button>
+      <% else %>
+        <%!-- Expanded panel --%>
+        <div class="fixed top-4 right-4 w-72 bg-cyan-950/95 border border-cyan-800 rounded-2xl shadow-2xl z-50 p-4 flex flex-col gap-3 backdrop-blur">
+          <div class="flex items-center justify-between">
+            <div class="flex items-center gap-3">
+              <%= if @state == :idle do %>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  class="h-4 w-4 text-cyan-500 shrink-0"
+                  viewBox="0 0 24 24"
+                  fill="currentColor"
+                >
+                  <path d="M12 1a4 4 0 0 1 4 4v7a4 4 0 0 1-8 0V5a4 4 0 0 1 4-4zm0 2a2 2 0 0 0-2 2v7a2 2 0 1 0 4 0V5a2 2 0 0 0-2-2zm-7 9a7 7 0 0 0 14 0h2a9 9 0 0 1-8 8.94V23h-2v-2.06A9 9 0 0 1 3 12H5z" />
+                </svg>
+                <span class="text-cyan-400 font-semibold text-sm">Voice Input</span>
+              <% end %>
+              <%= if @state == :recording do %>
+                <span class="relative flex h-3 w-3 shrink-0">
+                  <span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75">
+                  </span>
+                  <span class="relative inline-flex rounded-full h-3 w-3 bg-red-500"></span>
+                </span>
+                <span class="text-cyan-50 font-semibold text-sm">Recording</span>
+              <% end %>
+              <%= if @state == :processing do %>
+                <span class="relative flex h-3 w-3 shrink-0">
+                  <span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-cyan-400 opacity-75">
+                  </span>
+                  <span class="relative inline-flex rounded-full h-3 w-3 bg-cyan-400"></span>
+                </span>
+                <span class="text-cyan-50 font-semibold text-sm">Processing…</span>
+              <% end %>
+              <%= if @state == :transcribed do %>
+                <span class="text-cyan-300 font-semibold text-sm">Transcription</span>
+              <% end %>
+            </div>
+            <%!-- Minimize button --%>
+            <button
+              phx-click="minimize"
+              title="Minimize"
+              class="p-1 rounded-lg text-cyan-600 hover:text-cyan-300 hover:bg-cyan-800/50 transition-colors"
             >
-              <path d="M12 1a4 4 0 0 1 4 4v7a4 4 0 0 1-8 0V5a4 4 0 0 1 4-4zm0 2a2 2 0 0 0-2 2v7a2 2 0 1 0 4 0V5a2 2 0 0 0-2-2zm-7 9a7 7 0 0 0 14 0h2a9 9 0 0 1-8 8.94V23h-2v-2.06A9 9 0 0 1 3 12H5z" />
+              <svg
-            </svg>
+                xmlns="http://www.w3.org/2000/svg"
-            <span class="text-cyan-400 font-semibold text-sm">Voice Input</span>
+                class="h-4 w-4"
-          <% end %>
+                viewBox="0 0 24 24"
-          <%= if @state == :recording do %>
+                fill="none"
-            <span class="relative flex h-3 w-3 shrink-0">
+                stroke="currentColor"
-              <span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75">
+                stroke-width="2"
-              </span>
+                stroke-linecap="round"
-              <span class="relative inline-flex rounded-full h-3 w-3 bg-red-500"></span>
+                stroke-linejoin="round"
-            </span>
+              >
-            <span class="text-cyan-50 font-semibold text-sm">Recording</span>
+                <path d="M5 12h14" />
-          <% end %>
+              </svg>
-          <%= if @state == :processing do %>
+            </button>
-            <span class="relative flex h-3 w-3 shrink-0">
+          </div>
-              <span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-cyan-400 opacity-75">
+          <%= if @state in [:recording, :processing] do %>
-              </span>
+            <div id="voice-viz-wrapper" phx-update="ignore">
-              <span class="relative inline-flex rounded-full h-3 w-3 bg-cyan-400"></span>
+              <canvas id="voice-viz-canvas" height="72" class="w-full rounded-lg bg-cyan-950 block">
-            </span>
+              </canvas>
-            <span class="text-cyan-50 font-semibold text-sm">Processing…</span>
+            </div>
           <% end %>
           <%= if @state == :transcribed do %>
-            <span class="text-cyan-300 font-semibold text-sm">Transcription</span>
+            <.transcription_display transcription={@transcription} />
+          <% end %>
+          <%= if @state == :idle do %>
+            <button
+              phx-click={JS.dispatch("voice:start", to: "#voice-control-hook")}
+              class="w-full flex items-center justify-between px-3 py-1.5 rounded-lg bg-cyan-700 hover:bg-cyan-600 text-cyan-50 text-xs font-medium transition-colors"
+            >
+              <span>Start Recording</span>
+              <kbd class="text-cyan-300 bg-cyan-800 border border-cyan-600 px-1.5 py-0.5 rounded font-mono">
+                Ctrl+Space
+              </kbd>
+            </button>
+          <% end %>
+          <%= if @state == :recording do %>
+            <button
+              phx-click={JS.dispatch("voice:stop", to: "#voice-control-hook")}
+              class="w-full flex items-center justify-between px-3 py-1.5 rounded-lg bg-cyan-800 hover:bg-cyan-700 text-cyan-50 text-xs font-medium transition-colors border border-cyan-700"
+            >
+              <span>Stop Recording</span>
+              <kbd class="text-cyan-300 bg-cyan-900 border border-cyan-700 px-1.5 py-0.5 rounded font-mono">
+                Space
+              </kbd>
+            </button>
+          <% end %>
+          <%= if @state == :transcribed do %>
+            <button
+              phx-click="dismiss_transcription"
+              class="text-xs text-cyan-500 hover:text-cyan-300 transition-colors text-center w-full"
+            >
+              Dismiss
+            </button>
           <% end %>
         </div>
-        <%= if @state in [:recording, :processing] do %>
+      <% end %>
-          <div id="voice-viz-wrapper" phx-update="ignore">
-            <canvas id="voice-viz-canvas" height="72" class="w-full rounded-lg bg-cyan-950 block">
-            </canvas>
-          </div>
-        <% end %>
-        <%= if @state == :transcribed do %>
-          <.transcription_display transcription={@transcription} />
-        <% end %>
-        <%= if @state == :idle do %>
-          <button
-            phx-click={JS.dispatch("voice:start", to: "#voice-control-hook")}
-            class="w-full flex items-center justify-between px-3 py-1.5 rounded-lg bg-cyan-700 hover:bg-cyan-600 text-cyan-50 text-xs font-medium transition-colors"
-          >
-            <span>Start Recording</span>
-            <kbd class="text-cyan-300 bg-cyan-800 border border-cyan-600 px-1.5 py-0.5 rounded font-mono">
-              Ctrl+Space
-            </kbd>
-          </button>
-        <% end %>
-        <%= if @state == :recording do %>
-          <button
-            phx-click={JS.dispatch("voice:stop", to: "#voice-control-hook")}
-            class="w-full flex items-center justify-between px-3 py-1.5 rounded-lg bg-cyan-800 hover:bg-cyan-700 text-cyan-50 text-xs font-medium transition-colors border border-cyan-700"
-          >
-            <span>Stop Recording</span>
-            <kbd class="text-cyan-300 bg-cyan-900 border border-cyan-700 px-1.5 py-0.5 rounded font-mono">
-              Space
-            </kbd>
-          </button>
-        <% end %>
-        <%= if @state == :transcribed do %>
-          <button
-            phx-click="dismiss_transcription"
-            class="text-xs text-cyan-500 hover:text-cyan-300 transition-colors text-center w-full"
-          >
-            Dismiss
-          </button>
-        <% end %>
-      </div>
     </div>
     """
   end
@@ -94,8 +134,16 @@ defmodule ElixirAiWeb.VoiceLive do
     """
   end
 
+  def handle_event("expand", _params, socket) do
+    {:noreply, assign(socket, expanded: true)}
+  end
+
+  def handle_event("minimize", _params, socket) do
+    {:noreply, assign(socket, expanded: false)}
+  end
+
   def handle_event("recording_started", _params, socket) do
-    {:noreply, assign(socket, state: :recording)}
+    {:noreply, assign(socket, state: :recording, expanded: true)}
   end
 
   def handle_event("audio_recorded", %{"data" => base64, "mime_type" => mime_type}, socket) do
@@ -120,7 +168,7 @@ defmodule ElixirAiWeb.VoiceLive do
   end
 
   def handle_event("dismiss_transcription", _params, socket) do
-    {:noreply, assign(socket, state: :idle, transcription: nil)}
+    {:noreply, assign(socket, state: :idle, transcription: nil, expanded: false)}
   end
 
   def handle_info({:transcription_result, {:ok, text}}, socket) do