fix: core review comments

Author: sudo-tee

lua/opencode/api.lua

@@ -334,6 +334,7 @@ function M.debug_session()
   debug_helper.debug_session()
 end
 
+---@type fun(): Promise<void>
 M.initialize = Promise.async(function()
   local id = require('opencode.id')
 
@@ -368,8 +369,8 @@ function M.agent_build()
   require('opencode.core').switch_to_mode('build')
 end
 
-function M.select_agent()
-  local modes = config_file.get_opencode_agents()
+M.select_agent = Promise.async(function()
+  local modes = config_file.get_opencode_agents():await()
   vim.ui.select(modes, {
     prompt = 'Select mode:',
   }, function(selection)
@@ -379,10 +380,10 @@ function M.select_agent()
 
     require('opencode.core').switch_to_mode(selection)
   end)
-end
+end)
 
-function M.switch_mode()
-  local modes = config_file.get_opencode_agents() --[[@as string[] ]]
+M.switch_mode = Promise.async(function()
+  local modes = config_file.get_opencode_agents():await() --[[@as string[] ]]
 
   local current_index = util.index_of(modes, state.current_mode)
 
@@ -394,7 +395,7 @@ function M.switch_mode()
   local next_index = (current_index % #modes) + 1
 
   require('opencode.core').switch_to_mode(modes[next_index])
-end
+end)
 
 function M.with_header(lines, show_welcome)
   show_welcome = show_welcome or show_welcome
@@ -506,7 +507,7 @@ M.mcp = Promise.async(function()
 end)
 
 function M.commands_list()
-  local commands = config_file.get_user_commands():await()
+  local commands = config_file.get_user_commands():wait()
   if not commands then
     vim.notify('No user commands found. Please check your opencode config file.', vim.log.levels.WARN)
     return
@@ -566,7 +567,7 @@ M.run_user_command = Promise.async(function(name, args)
           require('opencode.history').write('/' .. name .. ' ' .. table.concat(args or {}, ' '))
         end)
       end)
-  end)
+  end) --[[@as Promise<void> ]]
 end)
 
 --- Compacts the current session by removing unnecessary data.
@@ -754,7 +755,7 @@ M.rename_session = Promise.async(function(current_session, new_title)
           vim.notify('Failed to rename session: ' .. vim.inspect(err), vim.log.levels.ERROR)
         end)
       end)
-      :and_then(function()
+      :and_then(Promise.async(function()
         current_session.title = title
         if state.active_session and state.active_session.id == current_session.id then
           local session_obj = session.get_by_id(current_session.id):await()
@@ -764,7 +765,7 @@ M.rename_session = Promise.async(function(current_session, new_title)
           end
         end
         promise:resolve(current_session)
-      end)
+      end))
   end
 
   if new_title and new_title ~= '' then
@@ -967,18 +968,20 @@ M.commands = {
     fn = function(args)
       local subcmd = args[1]
       if subcmd == 'new' then
-        local title = table.concat(vim.list_slice(args, 2), ' ')
-        if title and title ~= '' then
-          local new_session = core.create_new_session(title)
-          if not new_session then
-            vim.notify('Failed to create new session', vim.log.levels.ERROR)
-            return
+        Promise.spawn(function()
+          local title = table.concat(vim.list_slice(args, 2), ' ')
+          if title and title ~= '' then
+            local new_session = core.create_new_session(title):await()
+            if not new_session then
+              vim.notify('Failed to create new session', vim.log.levels.ERROR)
+              return
+            end
+            state.active_session = new_session
+            M.open_input()
+          else
+            M.open_input_new_session()
           end
-          state.active_session = new_session:await()
-          M.open_input()
-        else
-          M.open_input_new_session()
-        end
+        end)
       elseif subcmd == 'select' then
         M.select_session()
       elseif subcmd == 'child' then
@@ -1230,6 +1233,7 @@ M.slash_commands_map = {
   ['/timeline'] = { fn = M.timeline, desc = 'Open timeline picker' },
   ['/undo'] = { fn = M.undo, desc = 'Undo last action' },
   ['/unshare'] = { fn = M.unshare, desc = 'Unshare current session' },
+  ['/rename'] = { fn = M.rename_session, desc = 'Rename current session' },
 }
 
 M.legacy_command_map = {

lua/opencode/core.lua

@@ -124,9 +124,9 @@ M.open = Promise.async(function(opts)
 
   if not ok then
     vim.notify('Error opening panel: ' .. tostring(err), vim.log.levels.ERROR)
-    return Promise:new():reject(err)
+    return Promise.new():reject(err)
   end
-  return Promise:new():resolve('ok')
+  return Promise.new():resolve('ok')
 end)
 
 --- Sends a message to the active session, creating one if necessary.

lua/opencode/promise.lua

@@ -1,15 +1,32 @@
 ---@generic T
+---@generic U
 ---@class Promise<T>
+---@field __index Promise<T>
 ---@field _resolved boolean
 ---@field _value T
 ---@field _error any
 ---@field _then_callbacks fun(value: T)[]
 ---@field _catch_callbacks fun(err: any)[]
 ---@field _coroutines thread[]
+---@field new fun(): Promise<T>
+---@field resolve fun(self: Promise<T>, value: T): Promise<T>
+---@field reject fun(self: Promise<T>, err: any): Promise<T>
+---@field and_then fun(self: Promise<T>, callback: fun(value: T): U | Promise<U> | nil): Promise<U>
+---@field catch fun(self: Promise<T>, error_callback: fun(err: any): any | Promise<any> | nil): Promise<T>
+---@field wait fun(self: Promise<T>, timeout?: integer, interval?: integer): T
+---@field peek fun(self: Promise<T>): T
+---@field is_resolved fun(self: Promise<T>): boolean
+---@field is_rejected fun(self: Promise<T>): boolean
+---@field await fun(self: Promise<T>): T
+---@field is_promise fun(obj: any): boolean
+---@field wrap fun(obj: T | Promise<T>): Promise<T>
+---@field spawn fun(fn: fun(): T|nil): Promise<T>
+---@field async fun(fn: fun(...): T?): fun(...): Promise<T>
 local Promise = {}
 Promise.__index = Promise
 
 ---Resume waiting coroutines with result
+---@generic T
 ---@param coroutines thread[]
 ---@param value T
 ---@param err any
@@ -37,7 +54,6 @@ function Promise.new()
   return self
 end
 
----@param self Promise<T>
 ---@param value T
 ---@return Promise<T>
 function Promise:resolve(value)
@@ -59,7 +75,6 @@ function Promise:resolve(value)
   return self
 end
 
----@param self Promise<T>
 ---@param err any
 ---@return Promise<T>
 function Promise:reject(err)
@@ -82,9 +97,8 @@ function Promise:reject(err)
 end
 
 ---@generic U
----@param self Promise<T>
----@param callback fun(value: T): U | Promise<U>
----@return Promise<U>
+---@param callback fun(value: T): U | Promise<U> | nil
+---@return Promise<U>?
 function Promise:and_then(callback)
   if not callback then
     error('callback is required')
@@ -127,8 +141,7 @@ function Promise:and_then(callback)
   return new_promise
 end
 
----@param self Promise<T>
----@param error_callback fun(err: any): any | Promise<any>
+---@param error_callback fun(err: any): any | Promise<any> | nil
 ---@return Promise<T>
 function Promise:catch(error_callback)
   local new_promise = Promise.new()
@@ -174,7 +187,6 @@ end
 --- This will block the main thread, so use with caution
 --- But is useful for synchronous code paths that need the result
 ---@generic T
----@param self Promise<T>
 ---@param timeout integer|nil Timeout in milliseconds (default: 5000)
 ---@param interval integer|nil Interval in milliseconds to check (default: 20)
 ---@return T
@@ -207,7 +219,6 @@ end
 -- Tries to get the value without waiting
 -- Useful for status checks where you don't want to block
 ---@generic T
----@param self Promise<T>
 ---@return T
 function Promise:peek()
   return self._value
@@ -225,7 +236,6 @@ end
 ---This function can only be called from within `coroutine.create` or `Promise.spawn` or `Promise.async`
 ---This will yield the coroutine until the promise resolves or rejects
 ---@generic T
----@param self Promise<T>
 ---@return T
 function Promise:await()
   -- If already resolved, return immediately
@@ -267,9 +277,10 @@ end
 
 ---@param obj T | Promise<T>
 ---@return Promise<T>
+---@return_cast T Promise<T>
 function Promise.wrap(obj)
   if Promise.is_promise(obj) then
-    return obj
+    return obj --[[@as Promise<T>]]
   else
     return Promise.new():resolve(obj)
   end

lua/opencode/session.lua

@@ -25,7 +25,7 @@ end
 ---Get the session storage path for the current workspace
 ---@return string
 M.get_workspace_session_path = Promise.async(function(project_id)
-  project_id = project_id or M.project_id() or ''
+  project_id = project_id or M.project_id():await() or ''
   local home = vim.uv.os_homedir()
   return home .. '/.local/share/opencode/storage/session/' .. project_id
 end)

lua/opencode/ui/completion/engines/vim_complete.lua

@@ -1,4 +1,4 @@
-local Promise = require('lua.opencode.promise')
+local Promise = require('opencode.promise')
 local M = {}
 
 local completion_active = false

lua/opencode/ui/debug_helper.lua

@@ -7,6 +7,7 @@
 local M = {}
 
 local state = require('opencode.state')
+local Promise = require('opencode.promise')
 
 function M.open_json_file(data)
   local tmpfile = vim.fn.tempname() .. '.json'
@@ -47,10 +48,10 @@ function M.debug_message()
   vim.notify('No message found in previous lines', vim.log.levels.WARN)
 end
 
-function M.debug_session()
+M.debug_session = Promise.async(function()
   local session = require('opencode.session')
 
-  local session_path = session.get_workspace_session_path()
+  local session_path = session.get_workspace_session_path():await()
   if not state.active_session then
     print('No active session')
     return
@@ -59,7 +60,7 @@ function M.debug_session()
     vim.api.nvim_set_current_win(state.last_code_win_before_opencode --[[@as integer]])
   end
   vim.cmd('e ' .. session_path .. '/' .. state.active_session.id .. '.json')
-end
+end)
 
 function M.save_captured_events(filename)
   if not state.event_manager then

lua/opencode/ui/session_picker.lua

@@ -10,7 +10,8 @@ local Promise = require('opencode.promise')
 ---@return PickerItem
 function format_session_item(session, width)
   local debug_text = 'ID: ' .. (session.id or 'N/A')
-  return base_picker.create_picker_item(session.title, session.time.updated, debug_text, width)
+  local updated_time = (session.time and session.time.updated) or 'N/A'
+  return base_picker.create_picker_item(session.title, updated_time, debug_text, width)
 end
 
 function M.pick(sessions, callback)

lua/opencode/ui/topbar.lua

@@ -63,7 +63,7 @@ local function update_winbar_highlights(win_id)
     table.insert(parts, 'Normal:OpencodeNormal')
   end
 
-  table.insert(parts, 'WinBar:OpencodeSessionDecription')
+  table.insert(parts, 'WinBar:OpencodeSessionDescription')
   table.insert(parts, 'WinBarNC:OpencodeSessionDescription')
 
   vim.api.nvim_set_option_value('winhighlight', table.concat(parts, ','), { win = win_id })
@@ -76,10 +76,8 @@ local function get_session_desc()
 
   local session_title = LABELS.NEW_SESSION_TITLE
 
-  if state.active_session then
-    if state.active_session and state.active_session ~= '' then
-      session_title = state.active_session.title
-    end
+  if state.active_session and state.active_session.title ~= '' then
+    session_title = state.active_session.title
   end
 
   if not session_title or type(session_title) ~= 'string' then