fix(renderer): mark dirty on tab switch; picker: multi-session tab open

Author: sudo-tee

lua/opencode/ui/renderer.lua

@@ -574,6 +574,10 @@ function M.render_full_session()
       or not state.active_session
       or state.active_session.id ~= target_session_id
     then
+      local runtime = session_tabs.get(target_tab_id)
+      if runtime then
+        runtime.renderer_dirty = true
+      end
       return nil
     end
     M._render_full_session_data(session_data, {

lua/opencode/ui/session_picker.lua

@@ -342,11 +342,20 @@ function M.pick(sessions, callback, opts)
     open_in_tab = {
       key = config.keymap.session_picker.open_in_tab,
       label = 'tab',
+      multi_selection = true,
       fn = Promise.async(function(selected, opts)
+        local session_runtime = require('opencode.services.session_runtime')
+        local sessions = type(selected) == 'table' and selected.id == nil and selected or { selected }
+
         if opts.close then
           opts.close()
+          Promise.delay(0):await()
+        end
+
+        for _, session in ipairs(sessions) do
+          session_runtime.open_session_in_tab(session):await()
+          Promise.delay(0):await()
         end
-        return require('opencode.services.session_runtime').open_session_in_tab(selected):await()
       end),
     },
     fork = {

tests/unit/renderer_session_tabs_spec.lua

@@ -3,6 +3,7 @@ local store = require('opencode.state.store')
 local session_tabs = require('opencode.state.session_tabs')
 local renderer = require('opencode.ui.renderer')
 local renderer_ctx = require('opencode.ui.renderer.ctx')
+local session = require('opencode.session')
 local Promise = require('opencode.promise')
 local stub = require('luassert.stub')
 
@@ -152,4 +153,37 @@ describe('renderer session tab contexts', function()
     assert.is_false(second.renderer_dirty)
     render_stub:revert()
   end)
+
+  it('marks an in-flight render dirty when its tab becomes inactive', function()
+    local first = session_tabs.ensure_current()
+    first.active_session = { id = 'session-one', title = 'One' }
+    local second = session_tabs.create({ id = 'session-two', title = 'Two' })
+
+    output_buf = vim.api.nvim_create_buf(false, true)
+    output_win = vim.api.nvim_open_win(output_buf, false, {
+      relative = 'editor',
+      width = 60,
+      height = 10,
+      row = 1,
+      col = 1,
+    })
+    state.ui.set_windows({ output_buf = output_buf, output_win = output_win })
+    state.jobs.set_api_client({})
+    store.set_raw('active_session', first.active_session)
+    store.set_raw('active_session_tab', first.id)
+
+    local messages = Promise.new()
+    local messages_stub = stub(session, 'get_messages').returns(messages)
+    renderer.render_full_session()
+
+    store.set_raw('active_session', second.active_session)
+    store.set_raw('active_session_tab', second.id)
+    messages:resolve({})
+    vim.wait(50, function()
+      return first.renderer_dirty
+    end)
+
+    assert.is_true(first.renderer_dirty)
+    messages_stub:revert()
+  end)
 end)

tests/unit/session_picker_spec.lua

@@ -250,6 +250,7 @@ describe('opencode.ui.session_picker', function()
 
     local open_stub = stub(session_runtime, 'open_session_in_tab').returns(Promise.new():resolve(selected_session))
     local closed = false
+    assert.is_true(captured_action.multi_selection)
     captured_action
       .fn(selected_session, {
         close = function()
@@ -265,6 +266,61 @@ describe('opencode.ui.session_picker', function()
     base_picker.pick = original_pick
   end)
 
+  it('opens multiple selected sessions in panel tabs', function()
+    local base_picker = require('opencode.ui.base_picker')
+    local original_pick = base_picker.pick
+    local sessions = {
+      { id = 'session-1', title = 'First session' },
+      { id = 'session-2', title = 'Second session' },
+    }
+    local captured_action
+
+    base_picker.pick = function(opts)
+      captured_action = opts.actions.open_in_tab
+      return true
+    end
+
+    session_picker.pick(sessions, function() end)
+
+    local opened = {}
+    local open_stub = stub(session_runtime, 'open_session_in_tab').invokes(function(session)
+      opened[#opened + 1] = session
+      return Promise.new():resolve(session)
+    end)
+    local closed = false
+    local original_delay = Promise.delay
+    local close_delay = Promise.new()
+    local between_opens_delay = Promise.new()
+    local delays = { close_delay, between_opens_delay, Promise.new():resolve(true) }
+    Promise.delay = function()
+      return table.remove(delays, 1)
+    end
+
+    local action_promise = captured_action.fn(sessions, {
+      close = function()
+        closed = true
+      end,
+    })
+    assert.is_true(closed)
+    assert.same({}, opened)
+
+    close_delay:resolve(true)
+    vim.wait(50, function()
+      return #opened == 1
+    end)
+    assert.same({ sessions[1] }, opened)
+
+    between_opens_delay:resolve(true)
+    action_promise:wait()
+    Promise.delay = original_delay
+
+    assert.same(sessions, opened)
+    assert.stub(open_stub).was_called(2)
+
+    open_stub:revert()
+    base_picker.pick = original_pick
+  end)
+
   -- -----------------------------------------------------------------------
   -- Integration tests: delete action triggers switch when parent/grandparent
   -- of the active session is deleted