Skip to content

fix(session_picker): switch to remaining session when deleting active one #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudo-tee merged 1 commit into from
Apr 17, 2026
Merged

fix(session_picker): switch to remaining session when deleting active one #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions lua/opencode/ui/session_picker.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,28 @@ function M.pick(sessions, callback)

local sessions_to_delete = type(selected) == 'table' and selected.id == nil and selected or { selected }

for _, session in ipairs(sessions_to_delete) do
if state.active_session and state.active_session.id == session.id then
local to_delete_ids = {}
for _, s in ipairs(sessions_to_delete) do
to_delete_ids[s.id] = true
end

local deleting_current = state.active_session and to_delete_ids[state.active_session.id] or false

if deleting_current then
local core = require('opencode.core')
local remaining = vim.tbl_filter(function(item)
return not to_delete_ids[item.id]
end, opts.items or {})

if #remaining > 0 then
core.switch_session(remaining[1].id):await()
else
vim.notify('deleting current session, creating new session')
state.session.set_active(require('opencode.core').create_new_session():await())
state.session.set_active(core.create_new_session():await())
end
end

for _, session in ipairs(sessions_to_delete) do
state.api_client:delete_session(session.id):catch(function(err)
vim.schedule(function()
vim.notify('Failed to delete session ' .. session.id .. ': ' .. vim.inspect(err), vim.log.levels.ERROR)
Expand Down
Loading