fix(renderer): handle inserting out of order parts

lua/opencode/core.lua

@@ -165,8 +165,6 @@ function M.before_run(opts)
   local is_new_session = opts and opts.new_session or not state.active_session
   opts = opts or {}
 
-  M.cancel()
-  -- ui.clear_output()
 
   M.open({
     new_session = is_new_session,

lua/opencode/ui/formatter.lua

@@ -194,7 +194,7 @@ function M._format_patch(output, part)
           '  %s Restore point `%s` - %s',
           icons.get('restore_point'),
           restore_point.id:sub(1, 8),
-          util.time_ago(restore_point.created_at)
+          util.format_time(restore_point.created_at)
         )
       )
       local restore_line = output:get_line_count()
@@ -235,7 +235,7 @@ function M.format_message_header(message)
   local icon = message.info.role == 'user' and icons.get('header_user') or icons.get('header_assistant')
 
   local time = message.info.time and message.info.time.created or nil
-  local time_text = (time and ' (' .. util.time_ago(time) .. ')' or '')
+  local time_text = (time and ' (' .. util.format_time(time) .. ')' or '')
   local role_hl = 'OpencodeMessageRole' .. role:sub(1, 1):upper() .. role:sub(2)
   local model_text = message.info.modelID and ' ' .. message.info.modelID or ''
   local debug_text = config.debug and ' [' .. message.info.id .. ']' or ''

lua/opencode/ui/renderer.lua

@@ -218,14 +218,16 @@ end
 ---Write data to output_buf, including normal text and extmarks
 ---@param formatted_data Output Formatted data as Output object
 ---@param part_id? string Optional part ID to store actions
+---@param start_line? integer Optional line to insert at (shifts content down). If nil, appends to end of buffer.
 ---@return {line_start: integer, line_end: integer}? Range where data was written
-function M._write_formatted_data(formatted_data, part_id)
+function M._write_formatted_data(formatted_data, part_id, start_line)
   if not state.windows or not state.windows.output_buf then
     return
   end
 
   local buf = state.windows.output_buf
-  local start_line = output_window.get_buf_line_count()
+  local is_insertion = start_line ~= nil
+  local target_line = start_line or output_window.get_buf_line_count()
   local new_lines = formatted_data.lines
   local extmarks = formatted_data.extmarks
 
@@ -234,19 +236,23 @@ function M._write_formatted_data(formatted_data, part_id)
   end
 
   if part_id and formatted_data.actions then
-    M._render_state:add_actions(part_id, formatted_data.actions, start_line)
+    M._render_state:add_actions(part_id, formatted_data.actions, target_line)
   end
 
-  output_window.set_lines(new_lines, start_line)
-  output_window.set_extmarks(extmarks, start_line)
+  if is_insertion then
+    output_window.set_lines(new_lines, target_line, target_line)
+  else
+    output_window.set_lines(new_lines, target_line)
+  end
+  output_window.set_extmarks(extmarks, target_line)
 
   return {
-    line_start = start_line,
-    line_end = start_line + #new_lines - 1,
+    line_start = target_line,
+    line_end = target_line + #new_lines - 1,
   }
 end
 
----Insert new part at end of buffer
+---Insert new part, either at end of buffer or in the middle for out-of-order parts
 ---@param part_id string Part ID
 ---@param formatted_data Output Formatted data as Output object
 ---@return boolean Success status
@@ -260,14 +266,42 @@ function M._insert_part_to_buffer(part_id, formatted_data)
     return true
   end
 
-  local range = M._write_formatted_data(formatted_data, part_id)
+  local is_current_message = state.current_message
+    and state.current_message.info
+    and state.current_message.info.id == cached.message_id
+
+  if is_current_message then
+    -- NOTE: we're inserting a part for the current message, just add it to the end
+
+    local range = M._write_formatted_data(formatted_data, part_id)
+    if not range then
+      return false
+    end
+
+    M._render_state:set_part(cached.part, range.line_start, range.line_end)
+
+    M._last_part_formatted = { part_id = part_id, formatted_data = formatted_data }
+
+    return true
+  end
+
+  -- NOTE: We're inserting a part for the first time for a previous message. We need to find
+  -- the insertion line (after the last part of this message or after the message header if
+  -- no parts).
+  local insertion_line = M._get_insertion_point_for_part(part_id, cached.message_id)
+  if not insertion_line then
+    return false
+  end
+
+  local range = M._write_formatted_data(formatted_data, part_id, insertion_line)
   if not range then
     return false
   end
 
-  M._render_state:set_part(cached.part, range.line_start, range.line_end)
+  local line_count = #formatted_data.lines
+  M._render_state:shift_all(insertion_line, line_count)
 
-  M._last_part_formatted = { part_id = part_id, formatted_data = formatted_data }
+  M._render_state:set_part(cached.part, range.line_start, range.line_end)
 
   return true
 end
@@ -280,13 +314,11 @@ end
 function M._replace_part_in_buffer(part_id, formatted_data)
   local cached = M._render_state:get_part(part_id)
   if not cached or not cached.line_start or not cached.line_end then
-    -- return M._insert_part_to_buffer(part_id, formatted_data)
     return false
   end
 
   local new_lines = formatted_data.lines
   local new_line_count = #new_lines
-  -- local old_line_count = cached.line_end - cached.line_start + 1
 
   local old_formatted = M._last_part_formatted
   local can_optimize = old_formatted
@@ -298,10 +330,14 @@ function M._replace_part_in_buffer(part_id, formatted_data)
   local write_start_line = cached.line_start
 
   if can_optimize then
+    -- NOTE: This is an optimization to only replace the lines that are different
+    -- if we're replacing the most recently formatted part.
+
     ---@cast old_formatted { formatted_data: { lines: string[] } }
     local old_lines = old_formatted.formatted_data.lines
     local first_diff_line = nil
 
+    -- Find the first line that's different
     for i = 1, math.min(#old_lines, new_line_count) do
       if old_lines[i] ~= new_lines[i] then
         first_diff_line = i
@@ -310,13 +346,15 @@ function M._replace_part_in_buffer(part_id, formatted_data)
     end
 
     if not first_diff_line and new_line_count > #old_lines then
+      -- The old lines all matched but maybe there are more new lines
       first_diff_line = #old_lines + 1
     end
 
     if first_diff_line then
       lines_to_write = vim.list_slice(new_lines, first_diff_line, new_line_count)
       write_start_line = cached.line_start + first_diff_line - 1
     elseif new_line_count == #old_lines then
+      -- Nothing was different, so we're done
       M._last_part_formatted = { part_id = part_id, formatted_data = formatted_data }
       return true
     end
@@ -790,6 +828,51 @@ function M._get_last_part_for_message(message)
   return nil
 end
 
+---Get insertion point for an out-of-order part
+---@param part_id string The part ID to insert
+---@param message_id string The message ID the part belongs to
+---@return integer? insertion_line The line to insert at (1-indexed), or nil on error
+function M._get_insertion_point_for_part(part_id, message_id)
+  local rendered_message = M._render_state:get_message(message_id)
+  if not rendered_message or not rendered_message.message then
+    return nil
+  end
+
+  local message = rendered_message.message
+
+  local insertion_line = rendered_message.line_end and (rendered_message.line_end + 1)
+  if not insertion_line then
+    return nil
+  end
+
+  local current_part_index = nil
+  if message.parts then
+    for i, part in ipairs(message.parts) do
+      if part.id == part_id then
+        current_part_index = i
+        break
+      end
+    end
+  end
+
+  if not current_part_index then
+    return insertion_line
+  end
+
+  for i = current_part_index - 1, 1, -1 do
+    local prev_part = message.parts[i]
+    if prev_part and prev_part.id then
+      local prev_rendered = M._render_state:get_part(prev_part.id)
+
+      if prev_rendered and prev_rendered.line_end then
+        return prev_rendered.line_end + 1
+      end
+    end
+  end
+
+  return insertion_line
+end
+
 ---Re-render existing part with current state
 ---Used for permission updates and other dynamic changes
 ---@param part_id string Part ID to re-render

lua/opencode/util.lua

@@ -187,6 +187,24 @@ function M.time_ago(timestamp)
   end
 end
 
+--- Format a timestamp as time (e.g., "10:23 AM" or "13 Oct 2025 03:32 PM")
+--- @param timestamp number
+--- @return string: Formatted time string
+function M.format_time(timestamp)
+  if timestamp > 1e12 then
+    timestamp = math.floor(timestamp / 1000)
+  end
+
+  local now = os.time()
+  local today_start = os.time(os.date('*t', now)) - os.date('*t', now).hour * 3600 - os.date('*t', now).min * 60 - os.date('*t', now).sec
+
+  if timestamp >= today_start then
+    return os.date('%I:%M %p', timestamp)
+  else
+    return os.date('%d %b %Y %I:%M %p', timestamp)
+  end
+end
+
 function M.index_of(tbl, value)
   for i, v in ipairs(tbl) do
     if v == value then

tests/data/multiple-messages-synthetic.expected.json

@@ -0,0 +1 @@
+{"lines":["","----","","","Message 1","","----","","","Response 2 - Part 1","","Response 2 - Part 2","","Response 2 - Part 3","","Response 2 - Part 4 (late arrival)","","----","","","Message 3","","----","","","Response 4 - Part 1","","Response 4 - Part 2","","Response 4 - Part 3","","Response 4 - Part 4 (late arrival)","","----","","","Message 5","","----","","","Response 6 - Part 1","","Response 6 - Part 2","","Response 6 - Part 3",""],"actions":[],"extmarks":[[1,2,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2001-09-09 01:46:41)","OpencodeHint"],[" [msg_001]","OpencodeHint"]],"virt_text_pos":"win_col"}],[2,3,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[3,4,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[4,7,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],["","OpencodeHint"],[" (2001-09-09 01:46:42)","OpencodeHint"],[" [msg_002]","OpencodeHint"]],"virt_text_pos":"win_col"}],[5,18,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2001-09-09 01:46:43)","OpencodeHint"],[" [msg_003]","OpencodeHint"]],"virt_text_pos":"win_col"}],[6,19,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[7,20,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[8,23,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],["","OpencodeHint"],[" (2001-09-09 01:46:44)","OpencodeHint"],[" [msg_004]","OpencodeHint"]],"virt_text_pos":"win_col"}],[9,34,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2001-09-09 01:46:45)","OpencodeHint"],[" [msg_005]","OpencodeHint"]],"virt_text_pos":"win_col"}],[10,35,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[11,36,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":true,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":4096,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[12,39,0,{"virt_text_hide":false,"virt_text_repeat_linebreak":false,"ns_id":3,"virt_text_win_col":-3,"right_gravity":true,"priority":10,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],["","OpencodeHint"],[" (2001-09-09 01:46:46)","OpencodeHint"],[" [msg_006]","OpencodeHint"]],"virt_text_pos":"win_col"}]],"timestamp":1761967800}