feat(core): ensure cwd is correct when opening the panel

Author: sudo-tee

lua/opencode/api_client.lua

@@ -1,4 +1,5 @@
 local server_job = require('opencode.server_job')
+local state = require('opencode.state')
 
 --- @class OpencodeApiClient
 --- @field base_url string The base URL of the opencode server
@@ -63,7 +64,7 @@ function OpencodeApiClient:_call(endpoint, method, body, query)
 
   if query then
     if not query.directory then
-      query.directory = vim.fn.getcwd()
+      query.directory = state.current_cwd or vim.fn.getcwd()
     end
 
     local params = {}

lua/opencode/core.lua

@@ -10,6 +10,7 @@ local config = require('opencode.config')
 local image_handler = require('opencode.image_handler')
 local Promise = require('opencode.promise')
 local permission_window = require('opencode.ui.permission_window')
+local log = require('opencode.log')
 
 local M = {}
 M._abort_count = 0
@@ -57,6 +58,27 @@ M.open_if_closed = Promise.async(function(opts)
   end
 end)
 
+M.is_prompting_allowed = function()
+  local mentioned_files = context.get_context().mentioned_files or {}
+  local allowed, err_msg = util.check_prompt_allowed(config.prompt_guard, mentioned_files)
+  if not allowed then
+    vim.notify(err_msg or 'Prompt denied by prompt_guard', vim.log.levels.ERROR)
+  end
+  return allowed
+end
+
+M.check_cwd = function()
+  if state.current_cwd ~= vim.fn.getcwd() then
+    log.debug(
+      'CWD changed since last check, resetting session and context',
+      { current_cwd = state.current_cwd, new_cwd = vim.fn.getcwd() }
+    )
+    state.current_cwd = vim.fn.getcwd()
+    state.active_session = nil
+    context.unload_attachments()
+  end
+end
+
 ---@param opts? OpenOpts
 M.open = Promise.async(function(opts)
   opts = opts or { focus = 'input', new_session = false }
@@ -69,13 +91,7 @@ M.open = Promise.async(function(opts)
 
   local are_windows_closed = state.windows == nil
   if are_windows_closed then
-    -- Check if whether prompting will be allowed
-    local mentioned_files = context.get_context().mentioned_files or {}
-    local allowed, err_msg = util.check_prompt_allowed(config.prompt_guard, mentioned_files)
-    if not allowed then
-      vim.notify(err_msg or 'Prompts will be denied by prompt_guard', vim.log.levels.WARN)
-    end
-
+    M.is_prompting_allowed()
     state.windows = ui.create_windows()
   end
 
@@ -85,22 +101,16 @@ M.open = Promise.async(function(opts)
     ui.focus_output({ restore_position = are_windows_closed })
   end
 
-  local server
-  local server_ok, server_err = pcall(function()
-    server = server_job.ensure_server():await()
-  end)
+  local server = server_job.ensure_server():await()
 
-  if not server_ok or not server then
+  if not server then
     state.is_opening = false
-    vim.notify('Failed to start opencode server: ' .. tostring(server_err or 'Unknown error'), vim.log.levels.ERROR)
-    return Promise.new():reject(server_err or 'Server failed to start')
+    return Promise.new():reject('Server failed to start')
   end
 
-  state.opencode_server = server
+  M.check_cwd()
 
   local ok, err = pcall(function()
-    state.opencode_server = server
-
     if opts.new_session then
       state.active_session = nil
       state.last_sent_context = nil
@@ -109,6 +119,7 @@ M.open = Promise.async(function(opts)
       M.ensure_current_mode():await()
 
       state.active_session = M.create_new_session():await()
+      log.debug('Created new session on open', { session = state.active_session.id })
     else
       M.ensure_current_mode():await()
       if not state.active_session then
@@ -549,32 +560,22 @@ end
 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('Working directory changed.', vim.log.levels.INFO)
-    log.debug('Working directory change %s', vim.inspect({ cwd = vim.fn.getcwd() }))
+  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()
-        vim.notify('Loading last session for new working dir [' .. vim.fn.getcwd() .. ']', vim.log.levels.INFO)
+  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()
+  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() or M.create_new_session():await()
+  local is_new = false
+  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 })
-        )
-      end),
-      200
-    )
-  end
+  log.debug('Loaded session for new working dir' .. vim.inspect({ session = state.active_session, is_new = is_new }))
 end)
 
 function M.setup()

lua/opencode/server_job.lua

@@ -2,6 +2,7 @@ local state = require('opencode.state')
 local curl = require('opencode.curl')
 local Promise = require('opencode.promise')
 local opencode_server = require('opencode.opencode_server')
+local log = require('opencode.log')
 
 local M = {}
 M.requests = {}
@@ -146,6 +147,8 @@ function M.ensure_server()
       promise:resolve(state.opencode_server)
     end,
     on_error = function(err)
+      log.error('Error starting opencode server: ' .. vim.inspect(err))
+      vim.notify('Failed to start opencode server', vim.log.levels.ERROR)
       promise:reject(err)
     end,
     on_exit = function(exit_opts)

lua/opencode/state.lua

@@ -43,6 +43,7 @@
 ---@field pre_zoom_width integer|nil
 ---@field required_version string
 ---@field opencode_cli_version string|nil
+---@field current_cwd string|nil
 ---@field append fun( key:string, value:any)
 ---@field remove fun( key:string, idx:number)
 ---@field subscribe fun( key:string|nil, cb:fun(key:string, new_val:any, old_val:any))
@@ -97,6 +98,7 @@ local _state = {
   -- versions
   required_version = '0.6.3',
   opencode_cli_version = nil,
+  current_cwd = vim.fn.getcwd(),
 }
 
 -- Listener registry: { [key] = {cb1, cb2, ...}, ['*'] = {cb1, ...} }

lua/opencode/ui/autocmds.lua

@@ -1,4 +1,3 @@
-local Promise = require('opencode.promise')
 local input_window = require('opencode.ui.input_window')
 local output_window = require('opencode.ui.output_window')
 local M = {}
@@ -52,6 +51,8 @@ function M.setup_autocmds(windows)
   vim.api.nvim_create_autocmd('DirChanged', {
     group = group,
     callback = function(event)
+      local state = require('opencode.state')
+      state.current_cwd = event.file
       local core = require('opencode.core')
       core.handle_directory_change()
     end,

tests/unit/api_client_spec.lua

@@ -63,6 +63,9 @@ describe('api_client', function()
     local original_call_api = server_job.call_api
     local captured_calls = {}
     local original_cwd = vim.fn.getcwd
+    local state = require('opencode.state')
+    state.current_cwd = '/current/directory'
+
     vim.fn.getcwd = function()
       return '/current/directory'
     end

tests/unit/core_spec.lua

@@ -152,6 +152,37 @@ describe('opencode.core', function()
       }, state.windows)
     end)
 
+    it('ensure the current cwd is correct when opening', function()
+      local cwd = vim.fn.getcwd()
+      state.current_cwd = nil
+      core.open({ new_session = false, focus = 'input' }):wait()
+      assert.equal(cwd, state.current_cwd)
+    end)
+
+    it('reload the active_session if cwd has changed since last session', function()
+      local original_getcwd = vim.fn.getcwd
+
+      state.windows = nil
+      state.active_session = { id = 'old-session' }
+      state.current_cwd = '/some/old/path'
+      vim.fn.getcwd = function()
+        return '/some/new/path'
+      end
+      session.get_last_workspace_session:revert()
+      stub(session, 'get_last_workspace_session').invokes(function()
+        local p = Promise.new()
+        p:resolve({ id = 'new_cwd-test-session' })
+        return p
+      end)
+
+      core.open({ new_session = false, focus = 'input' }):wait()
+
+      assert.truthy(state.active_session)
+      assert.equal('new_cwd-test-session', state.active_session.id)
+      -- Restore original cwd function
+      vim.fn.getcwd = original_getcwd
+    end)
+
     it('handles new session properly', function()
       state.windows = nil
       state.active_session = { id = 'old-session' }
@@ -472,25 +503,14 @@ 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(context, 'unload_attachments')
     end)
 
-    after_each(function()
-      vim.defer_fn = original_defer_fn
-    end)
-
     it('clears active session and context', function()
       state.active_session = { id = 'old-session' }
       state.last_sent_context = { some = 'context' }