refactor(cli/client): inline require calls to opencode.config

Author: e-roux

lua/opencode/cli/client.lua

@@ -3,8 +3,6 @@
 --- - [implementation](https://github.com/sst/opencode/blob/dev/packages/opencode/src/server/server.ts)
 local M = {}
 
-local config = require("opencode.config")
-
 local sse_state = {
   -- Track the port - `opencode` may have restarted, usually on a new port
   port = nil,
@@ -50,6 +48,23 @@ local function generate_uuid()
   )
 end
 
+---Resolve the full URL for a given port and path, ensuring a valid hostname.
+---@param port number
+---@param path string
+---@return string
+local function resolve_server_url(port, path)
+  local config = require("opencode.config")
+  local hostname = config.opts.hostname
+  -- fallback to localhost as config is basically not validated
+  if not hostname or hostname == "" then
+    hostname = "localhost"
+  end
+  if not vim.startswith(path, "/") then
+    path = "/" .. path
+  end
+  return string.format("http://%s:%d%s", hostname, port, path)
+end
+
 ---@param url string
 ---@param method string
 ---@param body table|nil
@@ -73,7 +88,7 @@ local function curl(url, method, body, callback)
   }
 
   -- Add basic auth if credentials are available
-  local auth = config.opts.auth
+  local auth = require("opencode.config").opts.auth
   if auth and auth.username and auth.password and auth.password ~= "" then
     table.insert(command, "-u")
     table.insert(command, auth.username .. ":" .. auth.password)
@@ -160,8 +175,8 @@ end
 ---@param callback fun(response: table)|nil
 ---@return number job_id
 function M.call(port, path, method, body, callback)
-  local hostname = config.opts.hostname
-  return curl("http://" .. hostname .. ":" .. port .. path, method, body, callback)
+  local url = resolve_server_url(port, path)
+  return curl(url, method, body, callback)
 end
 
 ---@param text string
@@ -270,22 +285,24 @@ end
 function M.get_path(port)
   -- Query each port synchronously for working directory
   -- TODO: Migrate to align with async paradigm used elsewhere
-  local hostname = config.opts.hostname
   local curl_cmd = {
     "curl",
     "-s",
     "--connect-timeout",
     "1",
   }
 
+  local config = require("opencode.config")
+
   -- Add basic auth if credentials are available
   local auth = config.opts.auth
   if auth and auth.username and auth.password and auth.password ~= "" then
     table.insert(curl_cmd, "-u")
     table.insert(curl_cmd, auth.username .. ":" .. auth.password)
   end
 
-  table.insert(curl_cmd, "http://" .. hostname .. ":" .. port .. "/path")
+  local url = resolve_server_url(port, "/path")
+  table.insert(curl_cmd, url)
 
   local curl_result = vim.system(curl_cmd):wait()
   require("opencode.util").check_system_call(curl_result, "curl")