fix: auto-set cwd in API queries

- Remove server restart logic on directory change
- Set default directory to current working directory in API client queries
- Change DirChangedPre to DirChanged autocmd for proper timing

Author: sudo-tee

lua/opencode/api_client.lua

@@ -62,6 +62,10 @@ function OpencodeApiClient:_call(endpoint, method, body, query)
   local url = self.base_url .. endpoint
 
   if query then
+    if not query.directory then
+      query.directory = vim.fn.getcwd()
+    end
+
     local params = {}
 
     for k, v in pairs(query) do

lua/opencode/core.lua

@@ -548,31 +548,25 @@ end
 --- @return Promise<void>
 M.handle_directory_change = Promise.async(function()
   local log = require('opencode.log')
+  if not state.active_session then
+    is_new = true
+    state.active_session = M.create_new_session():await()
+  end
 
   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()
+    vim.notify('Working directory changed.', vim.log.levels.INFO)
+    log.debug('Working directory change %s', vim.inspect({ cwd = vim.fn.getcwd() }))
 
     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
+        state.active_session = session.get_last_workspace_session():await() or M.create_new_session():await()
 
         log.debug(
           'Loaded session for new working dir' .. vim.inspect({ session = state.active_session, is_new = is_new })

lua/opencode/ui/autocmds.lua

@@ -49,7 +49,7 @@ function M.setup_autocmds(windows)
     end,
   })
 
-  vim.api.nvim_create_autocmd('DirChangedPre', {
+  vim.api.nvim_create_autocmd('DirChanged', {
     group = group,
     callback = function(event)
       local core = require('opencode.core')

tests/unit/api_client_spec.lua

@@ -62,6 +62,10 @@ describe('api_client', function()
     local server_job = require('opencode.server_job')
     local original_call_api = server_job.call_api
     local captured_calls = {}
+    local original_cwd = vim.fn.getcwd
+    vim.fn.getcwd = function()
+      return '/current/directory'
+    end
 
     server_job.call_api = function(url, method, body)
       table.insert(captured_calls, { url = url, method = method, body = body })
@@ -74,7 +78,7 @@ describe('api_client', function()
 
     -- Test without query params
     client:list_projects()
-    assert.are.equal('http://localhost:8080/project', captured_calls[1].url)
+    assert.are.equal('http://localhost:8080/project?directory=/current/directory', captured_calls[1].url)
     assert.are.equal('GET', captured_calls[1].method)
 
     -- Test with query params
@@ -95,5 +99,6 @@ describe('api_client', function()
 
     -- Restore original function
     server_job.call_api = original_call_api
+    vim.fn.getcwd = original_cwd
   end)
 end)

tests/unit/core_spec.lua

@@ -484,72 +484,14 @@ describe('opencode.core', function()
         fn()
       end
 
-      stub(server_job, 'ensure_server').invokes(function()
-        local p = Promise.new()
-        p:resolve({
-          is_running = function()
-            return true
-          end,
-          shutdown = function()
-            return Promise.new():resolve()
-          end,
-          url = 'http://127.0.0.1:4000',
-        })
-        return p
-      end)
       stub(context, 'unload_attachments')
     end)
 
     after_each(function()
       vim.defer_fn = original_defer_fn
-      if server_job.ensure_server.revert then
-        server_job.ensure_server:revert()
-      end
-      if context.unload_attachments.revert then
-        context.unload_attachments:revert()
-      end
-    end)
-
-    it('does nothing when no server is running', function()
-      state.opencode_server = nil
-      state.active_session = { id = 'sess1' }
-
-      core.handle_directory_change():wait()
-
-      assert.is_nil(state.opencode_server)
-      assert.equal('sess1', state.active_session.id)
-      assert.stub(server_job.ensure_server).was_not_called()
-    end)
-
-    it('shuts down existing server and starts new one', function()
-      local shutdown_called = false
-      state.opencode_server = {
-        is_running = function()
-          return true
-        end,
-        shutdown = function()
-          shutdown_called = true
-          return Promise.new():resolve()
-        end,
-        url = 'http://127.0.0.1:4000',
-      }
-
-      core.handle_directory_change():wait()
-
-      assert.is_true(shutdown_called)
-      assert.stub(server_job.ensure_server).was_called()
     end)
 
     it('clears active session and context', function()
-      state.opencode_server = {
-        is_running = function()
-          return true
-        end,
-        shutdown = function()
-          return Promise.new():resolve()
-        end,
-        url = 'http://127.0.0.1:4000',
-      }
       state.active_session = { id = 'old-session' }
       state.last_sent_context = { some = 'context' }
 
@@ -563,16 +505,6 @@ describe('opencode.core', function()
     end)
 
     it('loads last workspace session for new directory', function()
-      state.opencode_server = {
-        is_running = function()
-          return true
-        end,
-        shutdown = function()
-          return Promise.new():resolve()
-        end,
-        url = 'http://127.0.0.1:4000',
-      }
-
       core.handle_directory_change():wait()
 
       assert.truthy(state.active_session)
@@ -581,16 +513,6 @@ describe('opencode.core', function()
     end)
 
     it('creates new session when no last session exists', function()
-      state.opencode_server = {
-        is_running = function()
-          return true
-        end,
-        shutdown = function()
-          return Promise.new():resolve()
-        end,
-        url = 'http://127.0.0.1:4000',
-      }
-
       -- Override stub to return nil (no last session)
       session.get_last_workspace_session:revert()
       stub(session, 'get_last_workspace_session').invokes(function()