Commit 30b629b

@@ -82,7 +82,8 @@ module Elelem
 
       def finalize_tool_calls(tool_calls)
         tool_calls.each do |tool_call|
-          tool_call[:arguments] = JSON.parse(tool_call.delete(:args))
+          args = tool_call.delete(:args)
+          tool_call[:arguments] = args.empty? ? {} : JSON.parse(args)
         end
       end
 

@@ -93,7 +93,7 @@ module Elelem
       [content, tool_calls]
     rescue => e
       terminal.say "\n  ✗ #{e.message}"
-      [nil, []]
+      ["Error: #{e.message} #{e.backtrace.join("\n")}", []]
     end
 
     def combined_history