fix(cwd): multiple cwd changes

Author: sudo-tee

lua/opencode/core.lua

@@ -545,28 +545,41 @@ end
 
 --- Handle working directory changes by restarting the server and loading the appropriate session.
 --- This function performs the following steps:
---- 1. Shuts down the existing opencode server
---- 2. Starts a new server instance
---- 3. Clears the active session and context
---- 4. Loads the last workspace session for the new directory, or creates a new one if none exists
 --- @return Promise<void>
 M.handle_directory_change = Promise.async(function()
   local log = require('opencode.log')
 
   if state.opencode_server then
     vim.notify('Directory changed, restarting Opencode server...', vim.log.levels.INFO)
     log.info('Shutting down Opencode server due to directory change...')
+
     state.opencode_server:shutdown():await()
-    server_job.ensure_server():await()
-    state.active_session = nil
-    vim.notify('Loading last session for new working dir', vim.log.levels.INFO)
-    state.last_sent_context = nil
-    context.unload_attachments()
-
-    state.active_session = session.get_last_workspace_session():await()
-    if not state.active_session then
-      state.active_session = M.create_new_session():await()
-    end
+
+    vim.defer_fn(
+      Promise.async(function()
+        state.opencode_server = nil
+        server_job.ensure_server():await()
+
+        vim.notify('Loading last session for new working dir [' .. vim.fn.getcwd() .. ']', vim.log.levels.INFO)
+
+        state.active_session = nil
+        state.last_sent_context = nil
+        context.unload_attachments()
+
+        local is_new = false
+        state.active_session = session.get_last_workspace_session():await()
+
+        if not state.active_session then
+          is_new = true
+          state.active_session = M.create_new_session():await()
+        end
+
+        log.debug(
+          'Loaded session for new working dir' .. vim.inspect({ session = state.active_session, is_new = is_new })
+        )
+      end),
+      200
+    )
   end
 end)
 

lua/opencode/ui/autocmds.lua

@@ -49,12 +49,12 @@ function M.setup_autocmds(windows)
     end,
   })
 
-  vim.api.nvim_create_autocmd('DirChanged', {
+  vim.api.nvim_create_autocmd('DirChangedPre', {
     group = group,
-    callback = Promise.async(function(event)
+    callback = function(event)
       local core = require('opencode.core')
-      core.handle_directory_change():await()
-    end),
+      core.handle_directory_change()
+    end,
   })
 
   if require('opencode.config').ui.position == 'current' then

tests/unit/core_spec.lua

@@ -472,10 +472,18 @@ describe('opencode.core', function()
   describe('handle_directory_change', function()
     local server_job
     local context
+    local original_defer_fn
 
     before_each(function()
       server_job = require('opencode.server_job')
       context = require('opencode.context')
+      original_defer_fn = vim.defer_fn
+
+      -- Mock vim.defer_fn to execute immediately in tests
+      vim.defer_fn = function(fn, delay)
+        fn()
+      end
+
       stub(server_job, 'ensure_server').invokes(function()
         local p = Promise.new()
         p:resolve({
@@ -493,6 +501,7 @@ describe('opencode.core', function()
     end)
 
     after_each(function()
+      vim.defer_fn = original_defer_fn
       if server_job.ensure_server.revert then
         server_job.ensure_server:revert()
       end