fix: improve server process shutdown with SIGKILL fallback and proper cleanup

Author: sudo-tee

lua/opencode/opencode_server.lua

@@ -24,7 +24,9 @@ local function ensure_vim_leave_autocmd()
     callback = function()
       local state = require('opencode.state')
       if state.opencode_server then
-        state.opencode_server:shutdown():wait(2000)
+        pcall(function()
+          state.opencode_server:shutdown():wait(2000)
+        end)
       end
     end,
   })
@@ -57,14 +59,20 @@ function OpencodeServer:shutdown()
 
   if self.job and self.job.pid then
     pcall(function()
-      self.job:kill('sigterm')
+      self.job:kill(vim.loop.constants.SIGTERM)
     end)
+
+    vim.defer_fn(function()
+      if self.job and self.job.pid then
+        pcall(function()
+          self.job:kill(vim.loop.constants.SIGKILL)
+        end)
+      end
+    end, 1000)
+  else
+    self.shutdown_promise:resolve(true)
   end
 
-  self.job = nil
-  self.url = nil
-  self.handle = nil
-  self.shutdown_promise:resolve(true)
   return self.shutdown_promise
 end
 

tests/unit/opencode_server_spec.lua

@@ -46,17 +46,39 @@ describe('opencode.opencode_server', function()
 
   it('shutdown resolves shutdown_promise and clears fields', function()
     local server = OpencodeServer.new()
-    server.job = { pid = 2, kill = function() end }
-    server.url = 'http://x'
-    server.handle = 2
+    local exit_callback
+    
+    -- Mock vim.system to capture the exit callback
+    vim.system = function(cmd, opts, on_exit)
+      exit_callback = on_exit
+      return { pid = 2, kill = function() end }
+    end
+    
+    -- Spawn the server so the exit callback is set up
+    server:spawn({
+      cwd = '.',
+      on_ready = function() end,
+      on_error = function() end,
+      on_exit = function() end,
+    })
+    
     local resolved = false
     server:get_shutdown_promise():and_then(function()
       resolved = true
     end)
+    
+    -- Call shutdown (sends SIGTERM)
     server:shutdown()
-    vim.wait(50, function()
+    
+    -- Simulate the process exiting by calling the exit callback
+    vim.schedule(function()
+      exit_callback({ code = 0, signal = 0 })
+    end)
+    
+    vim.wait(100, function()
       return resolved
     end)
+    
     assert.is_true(resolved)
     assert.is_nil(server.job)
     assert.is_nil(server.url)