fix(session_formatter): fix patch/code spacing

Also trim newlines off of _format_callout

Author: cameronr

lua/opencode/ui/session_formatter.lua

@@ -261,7 +261,6 @@ end
 
 function M._format_patch(part)
   local restore_points = snapshot.get_restore_points_by_parent(part.hash)
-  M.output:add_empty_line()
   M._format_action(icons.get('snapshot') .. ' Created Snapshot', vim.trim(part.hash:sub(1, 8)))
   local snapshot_header_line = M.output:get_line_count()
 
@@ -392,7 +391,9 @@ function M._format_callout(callout, text, title)
     text = ok and substituted or text
   end
 
-  local lines = vim.split(text, '\n')
+  -- Trim off any trailing newlines so there isn't an extra line in the
+  -- extmarks section
+  local lines = vim.split(text:gsub('\n$', ''), '\n')
   if #lines == 1 and title == '' then
     M.output:add_line('> [!' .. callout .. '] ' .. lines[1])
   else
@@ -564,14 +565,14 @@ end
 ---@param part MessagePart
 function M._format_tool(part)
   local tool = part.tool
-  if not tool then
+  if not tool or not part.state then
     return
   end
 
   local start_line = M.output:get_line_count() + 1
-  local input = (part.state and part.state.input) or {}
-  local metadata = (part.state and part.state.metadata) or {}
-  local output = (part.state and part.state.output) or ''
+  local input = part.state.input or {}
+  local metadata = part.state.metadata or {}
+  local output = part.state.output or ''
 
   if state.current_permission and state.current_permission.messageID == part.messageID then
     metadata = state.current_permission.metadata or metadata
@@ -597,12 +598,15 @@ function M._format_tool(part)
     M._format_action(icons.get('tool') .. ' tool', tool)
   end
 
-  if part.state then
-    if part.state.status == 'error' then
-      M._format_callout('ERROR', part.state.error)
-    elseif part.state.input and part.state.input.error then
-      M._format_callout('ERROR', part.state.input.error)
-    end
+  if part.state.status == 'error' then
+    M.output:add_line('')
+    M._format_callout('ERROR', part.state.error)
+  ---@diagnostic disable-next-line: undefined-field
+  elseif part.state.input and part.state.input.error then
+    M.output:add_line('')
+    ---I'm not sure about the type with state.input.error
+    ---@diagnostic disable-next-line: undefined-field
+    M._format_callout('ERROR', part.state.input.error)
   end
 
   if
@@ -658,7 +662,6 @@ function M._format_code(lines, language)
   M.output:add_line('```' .. (language or ''))
   M.output:add_lines(lines)
   M.output:add_line('```')
-  M.output:add_empty_line()
 end
 
 function M._format_diff(code, file_type)
@@ -695,7 +698,6 @@ function M._format_diff(code, file_type)
     end
   end
   M.output:add_line('```')
-  M.output:add_empty_line()
 end
 
 function M._add_vertical_border(start_line, end_line, hl_group, win_col)

tests/data/diff.expected.json

@@ -1 +1 @@
-{"timestamp":1760315563,"extmarks":[[1,2,0,{"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2025-10-11 23:42:56)","OpencodeHint"],[" [msg_9d7287269001C5gRusYfX7A1w1]","OpencodeHint"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":10,"virt_text_repeat_linebreak":false}],[2,3,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":4096,"virt_text_repeat_linebreak":true}],[3,4,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":4096,"virt_text_repeat_linebreak":true}],[4,5,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":4096,"virt_text_repeat_linebreak":true}],[5,6,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":4096,"virt_text_repeat_linebreak":true}],[6,9,0,{"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 23:42:56)","OpencodeHint"],[" [msg_9d7287287001HVwpPaH7WkRVdN]","OpencodeHint"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":10,"virt_text_repeat_linebreak":false}],[21,11,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[22,12,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[23,13,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[24,14,0,{"end_col":0,"end_row":15,"hl_eol":true,"right_gravity":true,"end_right_gravity":false,"virt_text_hide":false,"ns_id":3,"virt_text_repeat_linebreak":false,"priority":5000,"virt_text":[["-","OpencodeDiffDelete"]],"virt_text_pos":"overlay","hl_group":"OpencodeDiffDelete"}],[25,14,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[26,15,0,{"end_col":0,"end_row":16,"hl_eol":true,"right_gravity":true,"end_right_gravity":false,"virt_text_hide":false,"ns_id":3,"virt_text_repeat_linebreak":false,"priority":5000,"virt_text":[["+","OpencodeDiffAdd"]],"virt_text_pos":"overlay","hl_group":"OpencodeDiffAdd"}],[27,15,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[28,16,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[29,17,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[30,18,0,{"virt_text":[["▌","OpencodeToolBorder"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-1,"priority":4096,"virt_text_repeat_linebreak":true}],[31,23,0,{"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 23:43:03)","OpencodeHint"],[" [msg_9d7288f2f001hW6NqqhtBc72UU]","OpencodeHint"]],"ns_id":3,"virt_text_hide":false,"right_gravity":true,"virt_text_pos":"win_col","virt_text_win_col":-3,"priority":10,"virt_text_repeat_linebreak":false}]],"lines":["","---","","","can you add \"great\" before \"string\" in @diff-test.txt?","","[diff-test.txt](diff-test.txt)","","---","","","**  edit** `diff-test.txt`","","```txt"," this is a string"," this is a great string","","```","","","**󰻛  Created Snapshot** `1f593f7e`","","---","",""]}
+{"extmarks":[[1,2,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":10,"virt_text_repeat_linebreak":false,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2025-10-11 23:42:56)","OpencodeHint"],[" [msg_9d7287269001C5gRusYfX7A1w1]","OpencodeHint"]],"virt_text_pos":"win_col"}],[2,3,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[3,4,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[4,5,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[5,6,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col"}],[6,9,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":10,"virt_text_repeat_linebreak":false,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 23:42:56)","OpencodeHint"],[" [msg_9d7287287001HVwpPaH7WkRVdN]","OpencodeHint"]],"virt_text_pos":"win_col"}],[21,11,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[22,12,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[23,13,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[24,14,0,{"priority":5000,"ns_id":3,"end_col":0,"end_row":15,"hl_eol":true,"right_gravity":true,"end_right_gravity":false,"virt_text_hide":false,"hl_group":"OpencodeDiffDelete","virt_text_repeat_linebreak":false,"virt_text":[["-","OpencodeDiffDelete"]],"virt_text_pos":"overlay"}],[25,14,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[26,15,0,{"priority":5000,"ns_id":3,"end_col":0,"end_row":16,"hl_eol":true,"right_gravity":true,"end_right_gravity":false,"virt_text_hide":false,"hl_group":"OpencodeDiffAdd","virt_text_repeat_linebreak":false,"virt_text":[["+","OpencodeDiffAdd"]],"virt_text_pos":"overlay"}],[27,15,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[28,16,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[29,17,0,{"virt_text_win_col":-1,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":4096,"virt_text_repeat_linebreak":true,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col"}],[30,22,0,{"virt_text_win_col":-3,"right_gravity":true,"ns_id":3,"virt_text_hide":false,"priority":10,"virt_text_repeat_linebreak":false,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 23:43:03)","OpencodeHint"],[" [msg_9d7288f2f001hW6NqqhtBc72UU]","OpencodeHint"]],"virt_text_pos":"win_col"}]],"timestamp":1760401089,"lines":["","---","","","can you add \"great\" before \"string\" in @diff-test.txt?","","[diff-test.txt](diff-test.txt)","","---","","","**  edit** `diff-test.txt`","","```txt"," this is a string"," this is a great string","","```","","**󰻛  Created Snapshot** `1f593f7e`","","---","",""]}

tests/data/permission-denied.expected.json

@@ -1 +1 @@
-{"timestamp":1760310663,"lines":["","---","","","add a file, test.txt, with \":)\" in it","","---","","","**  write** `test.txt`","","```txt",":)","```","","","**󰻛  Created Snapshot** `c78fb2dd`","","---","",""],"extmarks":[[1,2,0,{"virt_text_win_col":-3,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":10,"virt_text_hide":false,"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2025-10-11 22:43:49)","OpencodeHint"],[" [msg_9d6f253910015UFmkGkiWtUsRW]","OpencodeHint"]],"virt_text_repeat_linebreak":false}],[2,3,0,{"virt_text_win_col":-3,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_repeat_linebreak":true}],[3,4,0,{"virt_text_win_col":-3,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_repeat_linebreak":true}],[4,7,0,{"virt_text_win_col":-3,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":10,"virt_text_hide":false,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 22:43:49)","OpencodeHint"],[" [msg_9d6f253df001TjqxW12FAjGf5s]","OpencodeHint"]],"virt_text_repeat_linebreak":false}],[27,9,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[28,10,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[29,11,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[30,12,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[31,13,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[32,14,0,{"virt_text_win_col":-1,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":4096,"virt_text_hide":false,"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_repeat_linebreak":true}],[33,19,0,{"virt_text_win_col":-3,"right_gravity":true,"virt_text_pos":"win_col","ns_id":3,"priority":10,"virt_text_hide":false,"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 22:44:00)","OpencodeHint"],[" [msg_9d6f27f4800103Tp3N6i6JW53p]","OpencodeHint"]],"virt_text_repeat_linebreak":false}]]}
+{"extmarks":[[1,2,0,{"virt_text":[["▌󰭻 ","OpencodeMessageRoleUser"],[" "],["USER","OpencodeMessageRoleUser"],["","OpencodeHint"],[" (2025-10-11 22:43:49)","OpencodeHint"],[" [msg_9d6f253910015UFmkGkiWtUsRW]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_win_col":-3,"right_gravity":true,"priority":10,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":false}],[2,3,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_win_col":-3,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[3,4,0,{"virt_text":[["▌","OpencodeMessageRoleUser"]],"virt_text_pos":"win_col","virt_text_win_col":-3,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[4,7,0,{"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 22:43:49)","OpencodeHint"],[" [msg_9d6f253df001TjqxW12FAjGf5s]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_win_col":-3,"right_gravity":true,"priority":10,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":false}],[26,9,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_win_col":-1,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[27,10,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_win_col":-1,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[28,11,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_win_col":-1,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[29,12,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_win_col":-1,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[30,13,0,{"virt_text":[["▌","OpencodeToolBorder"]],"virt_text_pos":"win_col","virt_text_win_col":-1,"right_gravity":true,"priority":4096,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":true}],[31,18,0,{"virt_text":[[" ","OpencodeMessageRoleAssistant"],[" "],["BUILD","OpencodeMessageRoleAssistant"],[" claude-sonnet-4.5","OpencodeHint"],[" (2025-10-11 22:44:00)","OpencodeHint"],[" [msg_9d6f27f4800103Tp3N6i6JW53p]","OpencodeHint"]],"virt_text_pos":"win_col","virt_text_win_col":-3,"right_gravity":true,"priority":10,"ns_id":3,"virt_text_hide":false,"virt_text_repeat_linebreak":false}]],"timestamp":1760401131,"lines":["","---","","","add a file, test.txt, with \":)\" in it","","---","","","**  write** `test.txt`","","```txt",":)","```","","**󰻛  Created Snapshot** `c78fb2dd`","","---","",""]}