Feature: load last cwd

README.md

@@ -89,6 +89,7 @@ require('possession').setup {
         delete = 'PossessionDelete',
         show = 'PossessionShow',
         list = 'PossessionList',
+        list_cwd = 'PossessionListCwd',
         migrate = 'PossessionMigrate',
     },
     hooks = {
@@ -192,6 +193,9 @@ require('telescope').load_extension('possession')
 Then use `:Telescope possession list` or `require('telescope').extensions.possession.list()`
 The default action will load selected session.
 
+Alternatively, use `:Telescope possession list cwd=true` or `require('telescope').extensions.possession.list({cwd=true})`
+This will limit the displayed sessions to those related to the current working directory.
+
 ![telescope](./img/telescope.png)
 
 ## Auto-save

doc/possession.txt

@@ -59,6 +59,12 @@ Show given session info.
 List available sessions. `:PossessionList!` will not hide the `vimscript`
 field that contains commands generated by |:mksession|.
 
+
+:PossessionListCwd~
+
+List available sessions for the cwd. `:PossessionListCwd!` will not hide
+the `vimscript` field that contains commands generated by |:mksession|.
+
                                                           *:PossessionMigrate*
 :PossessionMigrate {dir_or_file}~
 
@@ -148,8 +154,8 @@ autosave.on_quit~
                                                          *possession-autoload*
 autoload.cwd~
     `boolean | function(): boolean`
-    Automatically load a session for current working directory (created by
-    `autosave.cwd`) on VimEnter if such a session exists.
+    Automatically load the last session for current working directory. This
+    could be one created by `autosave.cwd` or a manually saved session.
 
                                                             *possession-hooks*
 hooks.before_save~

lua/possession.lua

@@ -23,7 +23,7 @@ local function setup(opts)
         cmd(names.save_cwd, '', { nargs = 0, bang = true }, function(o)
             commands.save_cwd(o.bang)
         end)
-        cmd(names.load_cwd, '', { nargs = 0 }, function(o)
+        cmd(names.load_cwd, '', { nargs = 0 }, function(_)
             commands.load_cwd()
         end)
         cmd(names.rename, 'old_name? new_name?', { nargs = '*', complete = complete }, function(o)
@@ -41,6 +41,9 @@ local function setup(opts)
         cmd(names.list, '', { nargs = 0, bang = true }, function(o)
             commands.list(o.bang)
         end)
+        cmd(names.list_cwd, '', { nargs = 0, bang = true }, function(o)
+            commands.list_cwd(o.bang)
+        end)
         cmd(names.migrate, 'dir_or_file', { nargs = 1, complete = 'file' }, function(o)
             commands.migrate(o.fargs[1])
         end)

lua/possession/commands.lua

@@ -66,12 +66,18 @@ local function get_current()
     return name
 end
 
-local function get_last()
-    local sessions = query.as_list()
+---@param only_cwd? boolean only consider sessions for the cwd
+---@param silent? boolean surpress an error if there is no last session
+local function get_last(only_cwd, silent)
+    only_cwd = only_cwd or false
+    silent = silent or false
+    local sessions = query.as_list(nil, only_cwd)
     query.sort_by(sessions, 'mtime', true)
     local last_session = sessions and sessions[1]
     if not last_session then
-        utils.error('Cannot find last loaded session - specify session name as an argument')
+        if not silent then
+            utils.error('Cannot find last loaded session - specify session name as an argument')
+        end
         return nil
     end
     return last_session.name
@@ -112,6 +118,14 @@ function M.load_cwd()
     session.load(paths.cwd_session_name())
 end
 
+function M.load_last(only_cwd)
+    local last = get_last(only_cwd, true)
+    if last then
+        session.load(last)
+        return last
+    end
+end
+
 local function maybe_input(value, opts, callback)
     if value then
         callback(value)
@@ -174,6 +188,11 @@ function M.list(full)
     display.echo_sessions { vimscript = full }
 end
 
+---@param full? boolean
+function M.list_cwd(full)
+    display.echo_sessions { vimscript = full, only_cwd = true }
+end
+
 ---@param path string
 function M.migrate(path)
     if vim.fn.getftype(path) == 'file' then

lua/possession/config.lua

@@ -35,6 +35,7 @@ local function defaults()
             delete = 'PossessionDelete',
             show = 'PossessionShow',
             list = 'PossessionList',
+            list_cwd = 'PossessionListCwd',
             migrate = 'PossessionMigrate',
         },
         hooks = {

lua/possession/display.lua

@@ -99,6 +99,7 @@ end
 ---@field buffers? boolean include buffers from parsed vimscript
 ---@field buffers_short? boolean show buffer paths normalized and relative to session cwd
 ---@field tab_cwd? boolean include tab cwds from parsed vimscript
+---@field only_cwd? boolean only show sessions for the cwd
 
 --- Print a list of sessions as Vim message
 ---@param opts? possession.EchoSessionsOpts
@@ -107,9 +108,10 @@ function M.echo_sessions(opts)
         sessions = nil,
         vimscript = false,
         user_data = true,
+        only_cwd = false,
     }, opts or {})
 
-    local sessions = opts.sessions or query.as_list()
+    local sessions = opts.sessions or query.as_list(nil, opts.only_cwd)
 
     local info = {}
     if opts.buffers or opts.tab_cwd then

lua/possession/query.lua

@@ -6,9 +6,11 @@ local config = require('possession.config')
 
 --- Get a sessions as a list-like table
 ---@param sessions? table<string, table> like from possession.session.list()
+---@param only_cwd? boolean only load sessions for the cwd
 ---@return table[] list of session data with additional `file` key
-function M.as_list(sessions)
-    sessions = sessions or session.list() --[[@as table<string, table> ]]
+function M.as_list(sessions, only_cwd)
+    only_cwd = only_cwd or false
+    sessions = sessions or session.list { cwd = only_cwd }
     local list = {}
     for file, data in pairs(sessions) do
         if data.file then

lua/possession/session.lua

@@ -178,10 +178,10 @@ function M.autosave_info()
     end
 end
 
-function M.autosave()
-    local info = M.autosave_info()
+function M.autosave(autosave_info)
+    local info = autosave_info or M.autosave_info()
     if info then
-        utils.debug('Auto-saving %s session "%s"', info.variant, state.session_name)
+        utils.debug('Auto-saving %s session "%s"', info.variant, info.name)
         M.save(info.name, { no_confirm = true })
     end
 end
@@ -236,8 +236,8 @@ function M.load(name_or_data)
 
     -- Autosave if not loading the auto-saved session itself
     local autosave_info = M.autosave_info()
-    if config.autosave.on_load and (autosave_info and session_data.name ~= M.autosave_info().name) then
-        M.autosave()
+    if config.autosave.on_load and (autosave_info and session_data.name ~= autosave_info.name) then
+        M.autosave(autosave_info)
     end
 
     -- Run pre-load hook that can pre-process user data, abort if returns falsy value.
@@ -362,10 +362,15 @@ function M.exists(name)
 end
 
 --- Get a list of sessions as map-like table
----@param opts? {}
+---@class possession.ListOpts
+---@field only_cwd? boolean only load sessions for cwd
+
+---@param opts? possession.ListOpts
 ---@return table<string, table> sessions {filename: session_data}
 function M.list(opts)
-    opts = opts or {}
+    opts = vim.tbl_extend('force', {
+        only_cwd = false,
+    }, opts or {})
     if opts.no_read then
         vim.deprecate('session.list().no_read', 'session files are now always read', '?', 'possession')
     end
@@ -374,14 +379,17 @@ function M.list(opts)
     local files_by_name = {}
 
     local sessions = {}
+    local cwd = vim.fn.getcwd(-1, -1)
     local glob = (Path:new(config.session_dir) / '*'):absolute()
     for _, file in ipairs(vim.fn.glob(glob, true, true)) do
         local path = Path:new(file)
         local data = vim.json.decode(path:read())
-        sessions[file] = data
+        if not opts.only_cwd or data.cwd == cwd then
+            sessions[file] = data
 
-        files_by_name[data.name] = files_by_name[data.name] or {}
-        table.insert(files_by_name[data.name], file)
+            files_by_name[data.name] = files_by_name[data.name] or {}
+            table.insert(files_by_name[data.name], file)
+        end
     end
 
     -- Check for name duplicates

lua/possession/telescope.lua

@@ -64,13 +64,15 @@ local session_actions = {
 ---@field default_action? 'load'|'save'|'delete'
 ---@field sessions? table[] list of sessions like returned by query.as_list
 ---@field sort? boolean|possession.QuerySortKey sort the initial sessions list, `true` means 'mtime'
+---@field only_cwd? boolean only display sessions for the cwd
 
 ---@param opts possession.TelescopeListOpts
 function M.list(opts)
     opts = vim.tbl_extend('force', {
         default_action = 'load',
         sessions = nil,
         sort = 'mtime',
+        only_cwd = false,
     }, opts or {})
 
     assert(
@@ -79,7 +81,7 @@ function M.list(opts)
     )
 
     local get_finder = function()
-        local sessions = opts.sessions and vim.list_slice(opts.sessions) or query.as_list()
+        local sessions = opts.sessions and vim.list_slice(opts.sessions) or query.as_list(nil, opts.only_cwd)
         if opts.sort then
             local key = opts.sort == true and 'name' or opts.sort
             local descending = key ~= 'name'

plugin/possession.lua

@@ -25,11 +25,10 @@ vim.api.nvim_create_autocmd('VimEnter', {
 
         local utils = require('possession.utils')
         if utils.as_function(config.autoload.cwd)() then
-            local paths = require('possession.paths')
-            local cwd = paths.cwd_session_name()
-            if paths.session(cwd):exists() then
-                utils.debug('Auto-loading CWD session: %s', cwd)
-                require('possession.session').load(cwd)
+            local cmd = require('possession.commands')
+            local session = cmd.load_last(true)
+            if session then
+                utils.debug('Auto-loading CWD session: %s', session)
             end
         end
     end,