fix: follow up on the load session by id (#205)

Author: carlos-algms

README.md

@@ -596,14 +596,16 @@ require("agentic").add_files_to_context({
 ```
 
 `restore_session_by_id(session_id)` accepts a **session_id** argument with the
-ID of the session you want to restore.
+ID of the session you want to restore. Session IDs come from your provider's
+session storage (e.g. provider logs, project metadata, or scripts that track
+them). Unlike `restore_session()`, this does not require the provider to
+support listing sessions.
 
 ```lua
 -- Restore a session by ID
 require("agentic").restore_session_by_id("58e5cf8a-1277-4e43-bc29-10c1246a2c66")
 ```
 
-
 ### Built-in Keybindings
 
 These keybindings are automatically set in Agentic buffers:
@@ -794,6 +796,11 @@ Call `require("agentic").restore_session()` to:
    (including sessions started in the terminal)
 2. Select a session to restore the full conversation history
 
+If you know the session ID, call
+`require("agentic").restore_session_by_id(session_id)` to restore a specific
+session directly. This skips listing sessions, so it also works with providers
+that don't support session listing.
+
 **Conflict handling:**
 
 If you try to restore a session when the current tab already has an active

doc/agentic.txt

@@ -440,7 +440,7 @@ agentic.restore_session()
 
                                              *agentic.restore_session_by_id()*
 agentic.restore_session_by_id({session_id})
-  Restore a previous session by it's ID.
+  Restore a previous session by its ID.
 
   Parameters: ~
     {session_id}  (string)  Session ID to restore.

doc/tags

@@ -64,6 +64,7 @@ agentic.new_session_with_provider()	agentic.txt	/*agentic.new_session_with_provi
 agentic.nvim	agentic.txt	/*agentic.nvim*
 agentic.open()	agentic.txt	/*agentic.open()*
 agentic.restore_session()	agentic.txt	/*agentic.restore_session()*
+agentic.restore_session_by_id()	agentic.txt	/*agentic.restore_session_by_id()*
 agentic.rotate_layout()	agentic.txt	/*agentic.rotate_layout()*
 agentic.setup()	agentic.txt	/*agentic.setup()*
 agentic.stop_generation()	agentic.txt	/*agentic.stop_generation()*

lua/agentic/init.lua

@@ -315,8 +315,8 @@ function Agentic.restore_session()
     end)
 end
 
--- restore a session by it's ID.
--- @param session_id string: the ID of the session to restore.
+--- Restore a session by its ID.
+--- @param session_id string
 function Agentic.restore_session_by_id(session_id)
     SessionRegistry.get_session_for_tab_page(nil, function(session)
         SessionRestore.restore_by_id(session, session_id)

lua/agentic/session_restore.lua

@@ -32,46 +32,6 @@ local function with_conflict_check(current_session, on_restore)
     end
 end
 
---- Show ACP session picker
---- @param sessions agentic.acp.SessionInfo[]
---- @param current_session agentic.SessionManager
-local function show_acp_picker(sessions, current_session)
-    local items = {}
-    for _, s in ipairs(sessions) do
-        local date = s.updatedAt and s.updatedAt:sub(1, 16):gsub("T", " ")
-            or "unknown date"
-        local title = s.title or "(no title)"
-        table.insert(items, {
-            display = string.format("%s - %s", date, title),
-            session_id = s.sessionId,
-            title = s.title,
-            updated_at = date,
-        })
-    end
-
-    vim.schedule(function()
-        vim.ui.select(items, {
-            prompt = "Select session to restore:",
-            format_item = function(item)
-                return item.display
-            end,
-        }, function(choice)
-            if not choice then
-                return
-            end
-
-            with_conflict_check(current_session, function()
-                current_session:load_acp_session(
-                    choice.session_id,
-                    choice.title,
-                    choice.updated_at
-                )
-                current_session.widget:show()
-            end)
-        end)
-    end)
-end
-
 --- Show session picker and restore selected session
 --- @param current_session agentic.SessionManager
 function SessionRestore.show_picker(current_session)
@@ -93,7 +53,41 @@ function SessionRestore.show_picker(current_session)
                 return
             end
 
-            show_acp_picker(sessions, current_session)
+            local items = {}
+            for _, s in ipairs(sessions) do
+                local date = s.updatedAt
+                        and s.updatedAt:sub(1, 16):gsub("T", " ")
+                    or "unknown date"
+                local title = s.title or "(no title)"
+                table.insert(items, {
+                    display = string.format("%s - %s", date, title),
+                    session_id = s.sessionId,
+                    title = s.title,
+                    updated_at = date,
+                })
+            end
+
+            vim.schedule(function()
+                vim.ui.select(items, {
+                    prompt = "Select session to restore:",
+                    format_item = function(item)
+                        return item.display
+                    end,
+                }, function(choice)
+                    if not choice then
+                        return
+                    end
+
+                    with_conflict_check(current_session, function()
+                        current_session:load_acp_session(
+                            choice.session_id,
+                            choice.title,
+                            choice.updated_at
+                        )
+                        current_session.widget:show()
+                    end)
+                end)
+            end)
         end)
     end)
 end
@@ -102,44 +96,11 @@ end
 --- @param current_session agentic.SessionManager
 --- @param session_id string
 function SessionRestore.restore_by_id(current_session, session_id)
-    local cwd = vim.fn.getcwd()
     current_session.agent:when_ready(function()
-        current_session.agent:list_sessions(cwd, function(result, err)
-            if err or not result then
-                Logger.notify(
-                    "Failed to list sessions: "
-                        .. (err and err.message or "unknown error"),
-                    vim.log.levels.WARN
-                )
-                return
-            end
-
-            local match = nil
-            for _, s in ipairs(result.sessions or {}) do
-                if s.sessionId == session_id then
-                    match = s
-                    break
-                end
-            end
-
-            if not match then
-                Logger.notify(
-                    "Session not found: " .. session_id,
-                    vim.log.levels.WARN
-                )
-                return
-            end
-
-            local title = match.title or "(no title)"
-            local date = match.updatedAt
-                    and match.updatedAt:sub(1, 16):gsub("T", " ")
-                or "unknown date"
-
-            vim.schedule(function()
-                with_conflict_check(current_session, function()
-                    current_session:load_acp_session(session_id, title, date)
-                    current_session.widget:show()
-                end)
+        vim.schedule(function()
+            with_conflict_check(current_session, function()
+                current_session:load_acp_session(session_id, nil, nil)
+                current_session.widget:show()
             end)
         end)
     end)

lua/agentic/session_restore.test.lua

@@ -129,6 +129,70 @@ describe("SessionRestore", function()
         end)
     end)
 
+    describe("restore_by_id", function()
+        it(
+            "calls load_acp_session with the given id without listing sessions",
+            function()
+                local session = create_mock_session()
+
+                SessionRestore.restore_by_id(
+                    session --[[@as agentic.SessionManager]],
+                    "abc-123"
+                )
+
+                assert.spy(session.agent.list_sessions).was.called(0)
+                assert.spy(session.load_acp_session).was.called(1)
+                local call_args = session.load_acp_session.calls[1]
+                assert.equal("abc-123", call_args[2])
+                assert.is_nil(call_args[3])
+                assert.is_nil(call_args[4])
+                assert.spy(session.widget.show).was.called(1)
+            end
+        )
+
+        it("prompts on conflict and only restores on confirm", function()
+            local session = create_mock_session({
+                chat_history = { messages = { { type = "user" } } },
+                session_id = "existing-session",
+            })
+
+            SessionRestore.restore_by_id(
+                session --[[@as agentic.SessionManager]],
+                "abc-123"
+            )
+
+            assert.spy(vim_ui_select_stub).was.called(1)
+
+            local conflict_callback = vim_ui_select_stub.calls[1][3]
+            conflict_callback("Clear current session and restore")
+
+            assert.spy(session.load_acp_session).was.called(1)
+            local call_args = session.load_acp_session.calls[1]
+            assert.equal("abc-123", call_args[2])
+            assert.spy(session.widget.show).was.called(1)
+        end)
+
+        it("does not restore when conflict prompt is cancelled", function()
+            local session = create_mock_session({
+                chat_history = { messages = { { type = "user" } } },
+                session_id = "existing-session",
+            })
+
+            SessionRestore.restore_by_id(
+                session --[[@as agentic.SessionManager]],
+                "abc-123"
+            )
+
+            assert.spy(vim_ui_select_stub).was.called(1)
+
+            local conflict_callback = vim_ui_select_stub.calls[1][3]
+            conflict_callback("Cancel")
+
+            assert.spy(session.load_acp_session).was.called(0)
+            assert.spy(session.widget.show).was.called(0)
+        end)
+    end)
+
     describe("show_picker with ACP session list", function()
         local acp_sessions = {
             {