feat(session_picker): add rename session action <C-r>

Author: sudo-tee

README.md

@@ -157,7 +157,9 @@ require('opencode').setup({
       deny = 'd', -- Deny permission request once (only available when there is a pending permission request)
     },
     session_picker = {
+      rename_session = { '<C-r>' }, -- Rename selected session in the session picker
       delete_session = { '<C-d>' }, -- Delete selected session in the session picker
+      new_session = { '<C-n>' }, -- Create and switch to a new session in the session picker
     },
     timeline_picker = {
       undo = { '<C-u>', mode = { 'i', 'n' } }, -- Undo to selected message in timeline picker

lua/opencode/config.lua

@@ -73,6 +73,7 @@ M.defaults = {
       deny = 'd',
     },
     session_picker = {
+      rename_session = { '<C-r>' },
       delete_session = { '<C-d>' },
       new_session = { '<C-n>' },
     },

lua/opencode/core.lua

@@ -15,7 +15,7 @@ M._abort_count = 0
 function M.select_session(parent_id)
   local all_sessions = session.get_all_workspace_sessions() or {}
   local filtered_sessions = vim.tbl_filter(function(s)
-    return s.description ~= '' and s ~= nil and s.parentID == parent_id
+    return s.title ~= '' and s ~= nil and s.parentID == parent_id
   end, all_sessions)
 
   ui.select_session(filtered_sessions, function(selected_session)

lua/opencode/promise.lua

@@ -194,4 +194,20 @@ function Promise:is_rejected()
   return self._resolved and self._error ~= nil
 end
 
+function Promise.is_promise(obj)
+  return type(obj) == 'table' and type(obj.and_then) == 'function' and type(obj.catch) == 'function'
+end
+
+---@generic T
+---@param obj T | Promise<T>
+---@return Promise<T>
+function Promise.wrap(obj)
+  if Promise.is_promise(obj) then
+    ---@cast obj Promise<T>
+    return obj
+  else
+    return Promise.new():resolve(obj)
+  end
+end
+
 return Promise

lua/opencode/session.lua

@@ -62,7 +62,7 @@ function M.create_session_object(session_json)
   local storage_path = M.get_storage_path()
   return {
     workspace = session_json.directory,
-    description = session_json.title or '',
+    title = session_json.title or '',
     modified = session_json.time and session_json.time.updated or os.time(),
     id = session_json.id,
     parentID = session_json.parentID,

lua/opencode/types.lua

@@ -40,7 +40,7 @@
 
 ---@class Session
 ---@field workspace string
----@field description string
+---@field title string
 ---@field modified number
 ---@field id string
 ---@field parentID string|nil
@@ -77,6 +77,7 @@
 ---@class OpencodeSessionPickerKeymap
 ---@field delete_session OpencodeKeymapEntry
 ---@field new_session OpencodeKeymapEntry
+---@field rename_session OpencodeKeymapEntry
 
 ---@class OpencodeTimelinePickerKeymap
 ---@field undo OpencodeKeymapEntry

lua/opencode/ui/base_picker.lua

@@ -1,10 +1,11 @@
 local config = require('opencode.config')
 local util = require('opencode.util')
+local Promise = require('opencode.promise')
 
 ---@class PickerAction
 ---@field key? OpencodeKeymapEntry|string The key binding for this action
 ---@field label string The display label for this action
----@field fn fun(selected: any, opts: PickerOptions): any[]? The action function
+---@field fn fun(selected: any, opts: PickerOptions): any[]|Promise<any[]>? The action function
 ---@field reload? boolean Whether to reload the picker after action
 
 ---@class PickerOptions
@@ -24,7 +25,7 @@ local util = require('opencode.util')
 ---@field fn_fzf_index fun(line: string): integer?
 
 ---@class FzfAction
----@field fn fun(selected: string[], fzf_opts: FzfLuaOptions): nil
+---@field fn fun(selected: string[], fzf_opts: FzfLuaOptions): nil|Promise<nil>
 ---@field header string
 ---@field reload boolean
 
@@ -127,10 +128,12 @@ local function telescope_ui(opts)
             local selection = action_state.get_selected_entry()
             if selection then
               local new_items = action.fn(selection.value, opts)
-              if action.reload and new_items then
-                opts.items = new_items
-                refresh_picker()
-              end
+              Promise.wrap(new_items):and_then(function(resolved_items)
+                if action.reload and resolved_items then
+                  opts.items = resolved_items
+                  refresh_picker()
+                end
+              end)
             end
           end
 
@@ -152,6 +155,39 @@ end
 local function fzf_ui(opts)
   local fzf_lua = require('fzf-lua')
 
+  local function create_fzf_config()
+    return {
+      winopts = opts.width and {
+          width = opts.width + 8, -- extra space for fzf UI
+        } or nil,
+      fzf_opts = { ['--prompt'] = opts.title .. ' > ' },
+      _headers = { 'actions' },
+      fn_fzf_index = function(line)
+        for i, item in ipairs(opts.items) do
+          if opts.format_fn(item):to_string() == line then
+            return i
+          end
+        end
+        return nil
+      end,
+    }
+  end
+
+  local function create_finder()
+    return function(fzf_cb)
+      for _, item in ipairs(opts.items) do
+        fzf_cb(opts.format_fn(item):to_string())
+      end
+      fzf_cb()
+    end
+  end
+
+  local function refresh_fzf()
+    vim.schedule(function()
+      fzf_ui(opts)
+    end)
+  end
+
   ---@type FzfLuaActions
   local actions_config = {
     ['default'] = function(selected, fzf_opts)
@@ -176,9 +212,13 @@ local function fzf_ui(opts)
           local idx = fzf_opts.fn_fzf_index(selected[1] --[[@as string]])
           if idx and opts.items[idx] then
             local new_items = action.fn(opts.items[idx], opts)
-            if action.reload and new_items then
-              opts.items = new_items
-            end
+            Promise.wrap(new_items):and_then(function(resolved_items)
+              if action.reload and resolved_items then
+                ---@cast resolved_items any[]
+                opts.items = resolved_items
+                refresh_fzf()
+              end
+            end)
           end
         end,
         header = action.label,
@@ -187,27 +227,10 @@ local function fzf_ui(opts)
     end
   end
 
-  fzf_lua.fzf_exec(function(fzf_cb)
-    for _, item in ipairs(opts.items) do
-      fzf_cb(opts.format_fn(item):to_string())
-    end
-    fzf_cb()
-  end, {
-    winopts = opts.width and {
-        width = opts.width + 8, -- extra space for fzf UI
-      } or nil,
-    fzf_opts = { ['--prompt'] = opts.title .. ' > ' },
-    _headers = { 'actions' },
-    actions = actions_config,
-    fn_fzf_index = function(line)
-      for i, item in ipairs(opts.items) do
-        if opts.format_fn(item):to_string() == line then
-          return i
-        end
-      end
-      return nil
-    end,
-  })
+  local fzf_config = create_fzf_config()
+  fzf_config.actions = actions_config
+
+  fzf_lua.fzf_exec(create_finder(), fzf_config)
 end
 
 ---Mini.pick UI implementation
@@ -230,15 +253,14 @@ local function mini_pick_ui(opts)
           local selected = mini_pick.get_picker_matches().current
           if selected and selected.item then
             local new_items = action.fn(selected.item, opts)
-            if action.reload and new_items then
-              opts.items = new_items
-              ---@type MiniPickItem[]
-              items = vim.tbl_map(function(it)
-                return { text = opts.format_fn(it):to_string(), item = it }
-              end, opts.items)
-              mini_pick.set_picker_items(items)
-            end
+            Promise.wrap(new_items):and_then(function(resolved_items)
+              if action.reload and resolved_items then
+                opts.items = resolved_items
+                mini_pick_ui(opts)
+              end
+            end)
           end
+          return true
         end,
       }
     end
@@ -318,10 +340,12 @@ local function snacks_picker_ui(opts)
         if item then
           vim.schedule(function()
             local new_items = action.fn(item, opts)
-            if action.reload and new_items then
-              opts.items = new_items
-              _picker:find()
-            end
+            Promise.wrap(new_items):and_then(function(resolved_items)
+              if action.reload and resolved_items then
+                opts.items = resolved_items
+                _picker:find()
+              end
+            end)
           end)
         end
       end

lua/opencode/ui/session_picker.lua

@@ -1,17 +1,49 @@
 local M = {}
 local config = require('opencode.config')
 local base_picker = require('opencode.ui.base_picker')
+local util = require('opencode.util')
 
 ---Format session parts for session picker
 ---@param session Session object
 ---@return PickerItem
 function format_session_item(session, width)
   local debug_text = 'ID: ' .. (session.id or 'N/A')
-  return base_picker.create_picker_item(session.description, session.modified, debug_text, width)
+  return base_picker.create_picker_item(session.title, session.modified, debug_text, width)
 end
 
 function M.pick(sessions, callback)
   local actions = {
+    rename = {
+      key = config.keymap.session_picker.rename_session,
+      label = 'rename',
+      fn = function(selected, opts)
+        local promise = require('opencode.promise').new()
+        local state = require('opencode.state')
+
+        vim.schedule(function()
+          vim.ui.input({ prompt = 'New session name: ', default = selected.title or '' }, function(input)
+            if input and input ~= '' then
+              state.api_client:update_session(selected.id, { title = input }):catch(function(err)
+                vim.schedule(function()
+                  vim.notify('Failed to rename session: ' .. vim.inspect(err), vim.log.levels.ERROR)
+                end)
+              end)
+              selected.title = input
+              local idx = util.find_index_of(opts.items, function(item)
+                return item.id == selected.id
+              end)
+
+              if idx > 0 then
+                opts.items[idx].title = input
+              end
+            end
+            promise:resolve(opts.items)
+          end)
+        end)
+        return promise
+      end,
+      reload = true,
+    },
     delete = {
       key = config.keymap.session_picker.delete_session,
       label = 'delete',
@@ -31,7 +63,9 @@ function M.pick(sessions, callback)
           end)
         end)
 
-        local idx = vim.fn.index(opts.items, selected) + 1
+        local idx = util.find_index_of(opts.items, function(item)
+          return item.id == selected.id
+        end)
         if idx > 0 then
           table.remove(opts.items, idx)
         end

lua/opencode/ui/topbar.lua

@@ -80,8 +80,8 @@ local function get_session_desc()
 
   if state.active_session then
     local session = require('opencode.session').get_by_id(state.active_session.id)
-    if session and session.description ~= '' then
-      session_desc = session.description
+    if session and session.title ~= '' then
+      session_desc = session.title
     end
   end
 

lua/opencode/util.lua

@@ -111,6 +111,15 @@ function M.index_of(tbl, value)
   return nil
 end
 
+function M.find_index_of(tbl, predicate)
+  for i, v in ipairs(tbl) do
+    if predicate(v) then
+      return i
+    end
+  end
+  return nil
+end
+
 local _is_git_project = nil
 function M.is_git_project()
   if _is_git_project ~= nil then