refactor: move stats to renderer

Trying to have formatter not have side effects

Author: cameronr

lua/opencode/ui/formatter.lua

@@ -40,25 +40,12 @@ function M._format_messages(session)
     output:add_lines(M.separator)
     state.current_message = msg
 
-    if not state.current_model and msg.info.providerID and msg.info.providerID ~= '' then
-      state.current_model = msg.info.providerID .. '/' .. msg.info.modelID
-    end
-
-    if msg.info.tokens and msg.info.tokens.input > 0 then
-      state.tokens_count = msg.info.tokens.input
-        + msg.info.tokens.output
-        + msg.info.tokens.cache.read
-        + msg.info.tokens.cache.write
-    end
-
-    if msg.info.cost and type(msg.info.cost) == 'number' then
-      state.cost = msg.info.cost
-    end
-
     if session.revert and session.revert.messageID == msg.info.id then
       ---@type {messages: number, tool_calls: number, files: table<string, {additions: number, deletions: number}>}
       local revert_stats = M._calculate_revert_stats(state.messages, i, session.revert)
       M._format_revert_message(output, revert_stats)
+
+      -- FIXME: how does reverting work? why is it breaking out of the message reading loop?
       break
     end
 
@@ -69,6 +56,7 @@ function M._format_messages(session)
     end
 
     if msg.info.error and msg.info.error ~= '' then
+      vim.notify('calling _format_error')
       M._format_error(output, msg.info)
     end
   end
@@ -788,27 +776,12 @@ end
 ---@param msg_idx number
 ---@return Output
 function M.format_message_header_single(message, msg_idx)
-  local temp_output = Output.new()
-
-  if not state.current_model and message.info.providerID and message.info.providerID ~= '' then
-    state.current_model = message.info.providerID .. '/' .. message.info.modelID
-  end
-
-  if message.info.tokens and message.info.tokens.input > 0 then
-    state.tokens_count = message.info.tokens.input
-      + message.info.tokens.output
-      + message.info.tokens.cache.read
-      + message.info.tokens.cache.write
-  end
-
-  if message.info.cost and type(message.info.cost) == 'number' then
-    state.cost = message.info.cost
-  end
+  local output = Output.new()
 
-  temp_output:add_lines(M.separator)
-  M._format_message_header(temp_output, message.info, msg_idx)
+  output:add_lines(M.separator)
+  M._format_message_header(output, message.info, msg_idx)
 
-  return temp_output
+  return output
 end
 
 ---@param error_text string

lua/opencode/ui/renderer.lua

@@ -97,8 +97,13 @@ function M._render_full_session_data(session_data)
   state.messages = session_data
   M._message_map:hydrate(state.messages)
 
+  M._update_stats_from_messages(state.messages)
+
   local output_data = formatter._format_messages(state.active_session)
 
+  -- FIXME: I think this should be setting state.last_user_message
+  -- Maybe it'd be better to move iterating over messages to renderer
+
   M.write_output(output_data)
   M._scroll_to_bottom()
 end
@@ -374,10 +379,12 @@ function M.on_message_updated(event)
     M._message_map:add_message(message.info.id, found_idx)
 
     M._write_message_header(message, found_idx)
+
     if message.info.role == 'user' then
       state.last_user_message = message
     end
   end
+  M._update_stats_from_message(message)
 
   M._scroll_to_bottom()
 end
@@ -636,4 +643,31 @@ function M.get_actions_for_line(line)
   return actions
 end
 
+---Update stats from all messages in session
+---@param messages OpencodeMessage[]
+function M._update_stats_from_messages(messages)
+  for _, msg in ipairs(messages) do
+    M._update_stats_from_message(msg)
+  end
+end
+
+---Update display stats from a single message
+---@param message OpencodeMessage
+function M._update_stats_from_message(message)
+  if not state.current_model and message.info.providerID and message.info.providerID ~= '' then
+    state.current_model = message.info.providerID .. '/' .. message.info.modelID
+  end
+
+  if message.info.tokens and message.info.tokens.input > 0 then
+    state.tokens_count = message.info.tokens.input
+      + message.info.tokens.output
+      + message.info.tokens.cache.read
+      + message.info.tokens.cache.write
+  end
+
+  if message.info.cost and type(message.info.cost) == 'number' then
+    state.cost = message.info.cost
+  end
+end
+
 return M