perf: use promise based waiting for the ensure_server

Author: sudo-tee

lua/opencode/api.lua

@@ -107,12 +107,9 @@ function M.select_history()
 end
 
 function M.toggle_pane()
-  if not state.windows then
-    core.open({ new_session = false, focus = 'output' })
-    return
-  end
-
-  ui.toggle_pane()
+  return core.open({ new_session = false, focus = 'output' }):and_then(function()
+    ui.toggle_pane()
+  end)
 end
 
 ---@param from_snapshot_id? string

lua/opencode/api_client.lua

@@ -30,7 +30,8 @@ function OpencodeApiClient:_ensure_base_url()
   local state = require('opencode.state')
 
   if not state.opencode_server then
-    state.opencode_server = server_job.ensure_server() --[[@as OpencodeServer]]
+    -- this is last resort - try to start the server and could be blocking
+    state.opencode_server = server_job.ensure_server():wait() --[[@as OpencodeServer]]
     -- shouldn't normally happen but prevents error in replay tester
     if not state.opencode_server then
       return false

lua/opencode/core.lua

@@ -65,10 +65,8 @@ function M.open(opts)
     state.windows = ui.create_windows()
   end
 
-  vim.schedule(function()
-    if not state.opencode_server or not state.opencode_server:is_running() then
-      state.opencode_server = server_job.ensure_server() --[[@as OpencodeServer]]
-    end
+  server_job.ensure_server():and_then(function(server)
+    state.opencode_server = server
 
     M.ensure_current_mode()
 

lua/opencode/server_job.lua

@@ -132,11 +132,11 @@ function M.stream_api(url, method, body, on_chunk)
 end
 
 function M.ensure_server()
+  local promise = Promise.new()
   if state.opencode_server and state.opencode_server:is_running() then
-    return state.opencode_server
+    return promise:resolve(state.opencode_server)
   end
 
-  local promise = Promise.new()
   state.opencode_server = opencode_server.new()
 
   state.opencode_server:spawn({
@@ -151,7 +151,7 @@ function M.ensure_server()
     end,
   })
 
-  return promise:wait()
+  return promise
 end
 
 return M

lua/opencode/ui/footer.lua

@@ -12,7 +12,7 @@ local function utf8_len(str)
 end
 
 local function get_mode_highlight()
-  local mode = (state.current_mode or ''):lower()
+  local mode = (state.current_mode or config.default_mode):lower()
   local highlights = {
     build = 'OpencodeAgentBuild',
     plan = 'OpencodeAgentPlan',
@@ -42,17 +42,15 @@ local function build_right_segments()
     table.insert(segments, { ' ' })
   end
 
-  if not state.is_running() and state.current_model then
+  if not state.is_running() and state.current_model and config.ui.display_model then
     table.insert(segments, { state.current_model, 'OpencodeHint' })
     table.insert(segments, { ' ' })
   end
 
-  if state.current_mode then
-    table.insert(segments, {
-      string.format(' %s ', state.current_mode:upper()),
-      get_mode_highlight(),
-    })
-  end
+  table.insert(segments, {
+    string.format(' %s ', (state.current_mode or config.default_mode):upper()),
+    get_mode_highlight(),
+  })
 
   return segments
 end

tests/unit/api_spec.lua

@@ -4,6 +4,7 @@ local ui = require('opencode.ui.ui')
 local state = require('opencode.state')
 local stub = require('luassert.stub')
 local assert = require('luassert')
+local Promise = require('opencode.promise')
 
 describe('opencode.api', function()
   local created_commands = {}
@@ -17,7 +18,10 @@ describe('opencode.api', function()
         opts = opts,
       })
     end)
-    stub(core, 'open')
+    stub(core, 'open').invokes(function()
+      return Promise.new():resolve('done')
+    end)
+
     stub(core, 'run')
     stub(core, 'cancel')
     stub(core, 'send_message')
@@ -118,13 +122,13 @@ describe('opencode.api', function()
 
       -- Test the exported functions
       assert.is_function(api.open_input, 'Should export open_input')
-      api.open_input()
+      api.open_input():wait()
       assert.stub(core.open).was_called()
       assert.stub(core.open).was_called_with({ new_session = false, focus = 'input', start_insert = true })
 
       -- Test run function
       assert.is_function(api.run, 'Should export run')
-      api.run('test prompt')
+      api.run('test prompt'):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('test prompt', {
         new_session = false,
@@ -133,7 +137,7 @@ describe('opencode.api', function()
 
       -- Test run_new_session function
       assert.is_function(api.run_new_session, 'Should export run_new_session')
-      api.run_new_session('test prompt new')
+      api.run_new_session('test prompt new'):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('test prompt new', {
         new_session = true,
@@ -144,7 +148,7 @@ describe('opencode.api', function()
 
   describe('run command argument parsing', function()
     it('parses agent prefix and passes to send_message', function()
-      api.commands.run.fn({ 'agent=plan', 'analyze', 'this', 'code' })
+      api.commands.run.fn({ 'agent=plan', 'analyze', 'this', 'code' }):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('analyze this code', {
         new_session = false,
@@ -154,7 +158,7 @@ describe('opencode.api', function()
     end)
 
     it('parses model prefix and passes to send_message', function()
-      api.commands.run.fn({ 'model=openai/gpt-4', 'test', 'prompt' })
+      api.commands.run.fn({ 'model=openai/gpt-4', 'test', 'prompt' }):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('test prompt', {
         new_session = false,
@@ -164,7 +168,7 @@ describe('opencode.api', function()
     end)
 
     it('parses context prefix and passes to send_message', function()
-      api.commands.run.fn({ 'context=current_file.enabled=false', 'test' })
+      api.commands.run.fn({ 'context=current_file.enabled=false', 'test' }):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('test', {
         new_session = false,
@@ -174,13 +178,15 @@ describe('opencode.api', function()
     end)
 
     it('parses multiple prefixes and passes all to send_message', function()
-      api.commands.run.fn({
-        'agent=plan',
-        'model=openai/gpt-4',
-        'context=current_file.enabled=false',
-        'analyze',
-        'code',
-      })
+      api.commands.run
+        .fn({
+          'agent=plan',
+          'model=openai/gpt-4',
+          'context=current_file.enabled=false',
+          'analyze',
+          'code',
+        })
+        :wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('analyze code', {
         new_session = false,
@@ -192,7 +198,7 @@ describe('opencode.api', function()
     end)
 
     it('works with run_new command', function()
-      api.commands.run_new.fn({ 'agent=plan', 'model=openai/gpt-4', 'new', 'session', 'prompt' })
+      api.commands.run_new.fn({ 'agent=plan', 'model=openai/gpt-4', 'new', 'session', 'prompt' }):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('new session prompt', {
         new_session = true,
@@ -210,7 +216,7 @@ describe('opencode.api', function()
     end)
 
     it('Lua API accepts opts directly without parsing', function()
-      api.run('test prompt', { agent = 'plan', model = 'openai/gpt-4' })
+      api.run('test prompt', { agent = 'plan', model = 'openai/gpt-4' }):wait()
       assert.stub(core.send_message).was_called()
       assert.stub(core.send_message).was_called_with('test prompt', {
         new_session = false,
@@ -434,6 +440,12 @@ describe('opencode.api', function()
     end)
 
     describe('user command model/agent selection', function()
+      before_each(function()
+        stub(api, 'open_input').invokes(function()
+          return Promise.new():resolve('done')
+        end)
+      end)
+
       it('invokes run with correct model and agent', function()
         local config_file = require('opencode.config_file')
         local original_get_user_commands = config_file.get_user_commands
@@ -466,8 +478,6 @@ describe('opencode.api', function()
           end,
         }
 
-        stub(api, 'open_input')
-
         local slash_commands = api.get_slash_commands()
 
         local test_no_model_cmd = nil
@@ -484,7 +494,7 @@ describe('opencode.api', function()
         assert.truthy(test_no_model_cmd, 'Should find /test-no-model command')
         assert.truthy(test_with_model_cmd, 'Should find /test-with-model command')
 
-        test_no_model_cmd.fn()
+        test_no_model_cmd.fn():wait()
         assert.equal(1, #send_command_calls)
         assert.equal('test-session', send_command_calls[1].session_id)
         assert.equal('test-no-model', send_command_calls[1].command_data.command)
@@ -494,7 +504,7 @@ describe('opencode.api', function()
 
         send_command_calls = {}
 
-        test_with_model_cmd.fn()
+        test_with_model_cmd.fn():wait()
         assert.equal(1, #send_command_calls)
         assert.equal('test-session', send_command_calls[1].session_id)
         assert.equal('test-with-model', send_command_calls[1].command_data.command)

tests/unit/server_job_spec.lua

@@ -98,9 +98,9 @@ describe('server_job', function()
       return fake
     end
 
-    local first = server_job.ensure_server()
+    local first = server_job.ensure_server():wait()
     assert.same(fake, first._value or first) -- ensure_server returns resolved promise value
-    local second = server_job.ensure_server()
+    local second = server_job.ensure_server():wait()
     assert.same(fake, second._value or second)
     assert.equal(1, spawn_count)
   end)