fix(server): opts.port testing and auto-add --port flag to terminal.cmd (#63)

Co-authored-by: Nick van Dyke <nickjvandyke15@gmail.com>

Author: erroris3

lua/opencode/cli/server.lua

@@ -126,28 +126,29 @@ local function poll_for_port(fn, callback)
     100,
     vim.schedule_wrap(function()
       local ok, find_port_result = pcall(fn)
-      if ok then
-        timer:stop()
-        timer:close()
-        callback(true, find_port_result)
-      elseif retries >= 20 then
+      if ok or retries >= 20 then
         timer:stop()
         timer:close()
-        callback(false, find_port_result)
+        callback(ok, find_port_result)
       else
         retries = retries + 1
       end
     end)
   )
 end
 
----Test if an opencode process is responding on the given port.
----Uses `curl` for better availability than `lsof`.
+---Test if a process is responding on `port`.
 ---@param port number
----@return number
+---@return number port
 local function test_port(port)
-  vim.cmd("silent !curl -s http://localhost:" .. port)
-  return vim.v.shell_error == 0 and port or error("Couldn't find an `opencode` process on port: " .. port, 0)
+  -- TODO: `curl` "/app" endpoint to verify it's actually an opencode server.
+  local chan = vim.fn.sockconnect("tcp", ("localhost:%d"):format(port), { rpc = false, timeout = 200 })
+  if chan == 0 then
+    error(("Couldn't find a process listening on port: %d"):format(port), 0)
+  else
+    pcall(vim.fn.chanclose, chan)
+    return port
+  end
 end
 
 ---Attempt to get the `opencode` server's port. Tries, in order:

lua/opencode/config.lua

@@ -15,7 +15,7 @@ vim.g.opencode_opts = vim.g.opencode_opts
 ---
 ---The port `opencode` is running on.
 ---If `nil`, searches for an `opencode` process inside Neovim's CWD (requires `lsof` to be installed on your system).
----Recommend launching `opencode` with `--port <port>` when setting this.
+---Launch `opencode` with `--port <port>` when this is set (the embedded terminal will automatically do so).
 ---@field port? number
 ---
 ---Reload buffers edited by `opencode` in real-time.
@@ -164,4 +164,9 @@ for _, field in ipairs({ "prompts", "contexts" }) do
   end
 end
 
+-- Auto-add `--port <port>` to embedded terminal command if set and not already present.
+if M.opts.port and not M.opts.terminal.cmd:find("--port") then
+  M.opts.terminal.cmd = M.opts.terminal.cmd .. " --port " .. tostring(M.opts.port)
+end
+
 return M